Merge remote-tracking branch 'upstream/pull/2400'

[rails.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index 1099cfd854efb3203267a0723f9e1c02b366dd35..c2bb066b7c9c291bd8854f27dc73844a5cd9cf4a 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -13,7 +13,7 @@ gem "psych", :platforms => :ruby_20
 gem "json"
 
 # Use postgres as the database
 gem "json"
 
 # Use postgres as the database

-gem "pg", "~> 0.18"
+gem "pg"

 
 # Use SCSS for stylesheets
 gem "sassc-rails"
 
 # Use SCSS for stylesheets
 gem "sassc-rails"


@@ -56,11 +56,11 @@ gem "http_accept_language", "~> 2.0.0"
 gem "i18n-js", ">= 3.0.0"
 gem "oauth-plugin", ">= 0.5.1"
 gem "openstreetmap-deadlock_retry", ">= 1.3.0", :require => "deadlock_retry"
 gem "i18n-js", ">= 3.0.0"
 gem "oauth-plugin", ">= 0.5.1"
 gem "openstreetmap-deadlock_retry", ">= 1.3.0", :require => "deadlock_retry"

-gem "paperclip", "~> 5.2"

 gem "rack-cors"
 gem "rails-i18n", "~> 4.0.0"
 gem "record_tag_helper"
 gem "rinku", ">= 2.0.6", :require => "rails_rinku"
 gem "rack-cors"
 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,11 +117,20 @@ 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"
 

+# Used for S3 object storage
+gem "aws-sdk-s3"
+
+# Used to resize user images
+gem "mini_magick"
+

 # Gems useful for development
 group :development do
   gem "annotate"
 # Gems useful for development
 group :development do
   gem "annotate"


@@ -137,6 +146,8 @@ group :test do
   gem "minitest", "~> 5.1", :platforms => [:ruby_19, :ruby_20]
   gem "rails-controller-testing"
   gem "rubocop"
   gem "minitest", "~> 5.1", :platforms => [:ruby_19, :ruby_20]
   gem "rails-controller-testing"
   gem "rubocop"

+  gem "rubocop-performance"
+  gem "rubocop-rails"

   gem "webmock"
 end
 
   gem "webmock"
 end
 


@@ -145,10 +156,7 @@ group :development, :test do
   gem "capybara", "~> 2.13"
   gem "coveralls", :require => false
   gem "erb_lint", :require => false
   gem "capybara", "~> 2.13"
   gem "coveralls", :require => false
   gem "erb_lint", :require => false

-  gem "eslint-rails-ee"
-  gem "execjs"

   gem "factory_bot_rails"
   gem "poltergeist"
   gem "puma", "~> 3.7"
   gem "factory_bot_rails"
   gem "poltergeist"
   gem "puma", "~> 3.7"

-  gem "therubyracer", :platforms => :ruby

 end
 end