Update bundle

[rails.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index 6c867193c8e240e5934c75074df3d1e56a7ef330..6597a3891f85b64171981e682c9b90e927a49728 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"


@@ -28,8 +28,7 @@ gem "coffee-rails", "~> 4.2"
 gem "jquery-rails"
 
 # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
 gem "jquery-rails"
 
 # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder

-# gem 'jbuilder', '~> 2.0'
-gem "jsonify-rails"
+gem "jbuilder", "~> 2.7"

 
 # Reduces boot times through caching; required in config/boot.rb
 gem "bootsnap", ">= 1.1.0", :require => false
 
 # Reduces boot times through caching; required in config/boot.rb
 gem "bootsnap", ">= 1.1.0", :require => false


@@ -44,7 +43,7 @@ gem "autoprefixer-rails", "~> 8.6.3"
 gem "image_optim_rails"
 
 # Load rails plugins
 gem "image_optim_rails"
 
 # Load rails plugins

-gem "actionpack-page_caching"
+gem "openstreetmap-actionpack-page_caching", ">= 1.1.2", :require => "actionpack/page_caching"

 gem "active_record_union"
 gem "activerecord-import"
 gem "cancancan"
 gem "active_record_union"
 gem "activerecord-import"
 gem "cancancan"


@@ -56,11 +55,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 "rack-cors"
 gem "rails-i18n", "~> 4.0.0"
 gem "record_tag_helper"

-gem "rinku", "= 2.0.4", :require => "rails_rinku"
+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 +116,20 @@ gem "canonical-rails"
 gem "logstasher"
 
 # Used to generate images for traces
 gem "logstasher"
 
 # Used to generate images for traces

+gem "bzip2-ffi"
+gem "ffi-libarchive"

 gem "gd2-ffij", ">= 0.4.0"
 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 +145,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
 


@@ -146,7 +156,6 @@ group :development, :test do
   gem "coveralls", :require => false
   gem "erb_lint", :require => false
   gem "factory_bot_rails"
   gem "coveralls", :require => false
   gem "erb_lint", :require => false
   gem "factory_bot_rails"

-  gem "jshint"

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