X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/6c202448ade514cd5ecca7175555011c851735e9..84d54522f2d3ccc6bf7ef1dd362cf15faa47ba21:/Gemfile

diff --git a/Gemfile b/Gemfile
index 06530b731..6597a3891 100644
--- a/Gemfile
+++ b/Gemfile
@@ -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 '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
@@ -44,7 +43,7 @@ gem "autoprefixer-rails", "~> 8.6.3"
 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"
@@ -56,7 +55,6 @@ 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 "paperclip", "~> 5.2"
 gem "rack-cors"
 gem "rails-i18n", "~> 4.0.0"
 gem "record_tag_helper"
@@ -126,6 +124,9 @@ gem "mimemagic"
 # Used for browser detection
 gem "browser"
 
+# Used for S3 object storage
+gem "aws-sdk-s3"
+
 # Used to resize user images
 gem "mini_magick"