Use built-in form submit translation keys for oauth client applications

[rails.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index 75b8f7bdc4ba6e8c5bb3d7706aeee0c93c340c0b..250221d75bd658ffeba36ae25ee33c17c0f8524a 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -61,6 +61,7 @@ gem "rack-cors"
 gem "rails-i18n", "~> 4.0.0"
 gem "record_tag_helper"
 gem "rinku", ">= 2.0.6", :require => "rails_rinku"
 gem "rails-i18n", "~> 4.0.0"
 gem "record_tag_helper"
 gem "rinku", ">= 2.0.6", :require => "rails_rinku"

+gem "strong_migrations"

 gem "validates_email_format_of", ">= 1.5.1"
 
 # Native OSM extensions
 gem "validates_email_format_of", ">= 1.5.1"
 
 # Native OSM extensions


@@ -117,7 +118,10 @@ gem "canonical-rails"
 gem "logstasher"
 
 # Used to generate images for traces
 gem "logstasher"
 
 # Used to generate images for traces

-gem "gd2-ffij"
+gem "bzip2-ffi"
+gem "ffi-libarchive"
+gem "gd2-ffij", ">= 0.4.0"
+gem "mimemagic"

 
 # Used for browser detection
 gem "browser"
 
 # Used for browser detection
 gem "browser"


@@ -138,6 +142,7 @@ group :test do
   gem "rails-controller-testing"
   gem "rubocop"
   gem "rubocop-performance"
   gem "rails-controller-testing"
   gem "rubocop"
   gem "rubocop-performance"

+  gem "rubocop-rails"

   gem "webmock"
 end
 
   gem "webmock"
 end