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

[rails.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index 34768095f3ca07c2c7037df8fff3d531b992f8d5..9ba2703134d5d9b9bf8e5c47904c188396a762e7 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,7 @@
 source "https://rubygems.org"
 
 # Require rails
 source "https://rubygems.org"
 
 # Require rails

-gem "rails", "4.2.7.1"
+gem "rails", "5.2.0"

 
 # Require things which have moved to gems in ruby 1.9
 gem "bigdecimal", "~> 1.1.0", :platforms => :ruby_19
 
 # Require things which have moved to gems in ruby 1.9
 gem "bigdecimal", "~> 1.1.0", :platforms => :ruby_19


@@ -13,16 +13,16 @@ gem "psych", :platforms => :ruby_20
 gem "json"
 
 # Use postgres as the database
 gem "json"
 
 # Use postgres as the database

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

 
 # Use SCSS for stylesheets
 
 # Use SCSS for stylesheets

-gem "sass-rails", "~> 5.0"
+gem "sassc-rails"

 
 # Use Uglifier as compressor for JavaScript assets
 gem "uglifier", ">= 1.3.0"
 
 # Use CoffeeScript for .js.coffee assets and views
 
 # Use Uglifier as compressor for JavaScript assets
 gem "uglifier", ">= 1.3.0"
 
 # Use CoffeeScript for .js.coffee assets and views

-gem "coffee-rails", "~> 4.1.0"
+gem "coffee-rails", "~> 4.2"

 
 # Use jquery as the JavaScript library
 gem "jquery-rails"
 
 # Use jquery as the JavaScript library
 gem "jquery-rails"


@@ -31,29 +31,36 @@ gem "jquery-rails"
 # gem 'jbuilder', '~> 2.0'
 gem "jsonify-rails"
 
 # gem 'jbuilder', '~> 2.0'
 gem "jsonify-rails"
 

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

 # Use R2 for RTL conversion
 # Use R2 for RTL conversion

-gem "r2"
+gem "r2", "~> 0.2.7"

 
 # Use autoprefixer to generate CSS prefixes
 
 # Use autoprefixer to generate CSS prefixes

-gem "autoprefixer-rails"
+gem "autoprefixer-rails", "~> 8.6.3"

 
 # Use image_optim to optimise images
 gem "image_optim_rails"
 
 # Load rails plugins
 gem "actionpack-page_caching"
 
 # Use image_optim to optimise images
 gem "image_optim_rails"
 
 # Load rails plugins
 gem "actionpack-page_caching"

-gem "composite_primary_keys", "~> 8.1.0"
-gem "deadlock_retry", ">= 1.2.0"
+gem "composite_primary_keys", "~> 11.0.0"

 gem "dynamic_form"
 gem "http_accept_language", "~> 2.0.0"
 gem "dynamic_form"
 gem "http_accept_language", "~> 2.0.0"

-gem "i18n-js", ">= 3.0.0.rc10"
+gem "i18n-js", ">= 3.0.0"

 gem "oauth-plugin", ">= 0.5.1"
 gem "oauth-plugin", ">= 0.5.1"

-gem "paperclip", "~> 4.0"
+gem "openstreetmap-deadlock_retry", ">= 1.3.0", :require => "deadlock_retry"
+gem "paperclip", "~> 5.2"

 gem "rack-cors"
 gem "rails-i18n", "~> 4.0.0"
 gem "rack-cors"
 gem "rails-i18n", "~> 4.0.0"

+gem "record_tag_helper"

 gem "rinku", ">= 1.2.2", :require => "rails_rinku"
 gem "validates_email_format_of", ">= 1.5.1"
 
 gem "rinku", ">= 1.2.2", :require => "rails_rinku"
 gem "validates_email_format_of", ">= 1.5.1"
 

+# Native OSM extensions
+gem "quad_tile", "~> 1.0.1"
+

 # Sanitise URIs
 gem "rack-uri_sanitizer"
 
 # Sanitise URIs
 gem "rack-uri_sanitizer"
 


@@ -69,6 +76,9 @@ gem "omniauth-windowslive"
 # Markdown formatting support
 gem "redcarpet"
 
 # Markdown formatting support
 gem "redcarpet"
 

+# For status transitions of Issues
+gem "aasm"
+

 # Load libxml support for XML parsing and generation
 gem "libxml-ruby", ">= 2.0.5", :require => "libxml"
 
 # Load libxml support for XML parsing and generation
 gem "libxml-ruby", ">= 2.0.5", :require => "libxml"
 


@@ -92,27 +102,38 @@ gem "rotp"
 gem "dalli"
 gem "kgio"
 
 gem "dalli"
 gem "kgio"
 

+# Load secure_headers for Content-Security-Policy support
+gem "secure_headers"
+
+# Load canonical-rails to generate canonical URLs
+gem "canonical-rails"
+

 # Used to generate logstash friendly log files
 gem "logstasher"
 
 # Gems useful for development
 group :development do
 # Used to generate logstash friendly log files
 gem "logstasher"
 
 # Gems useful for development
 group :development do

+  gem "annotate"
+  gem "better_errors"
+  gem "binding_of_caller"
+  gem "listen"

   gem "vendorer"
 end
 
 # Gems needed for running tests
 group :test do
   gem "minitest", "~> 5.1", :platforms => [:ruby_19, :ruby_20]
   gem "vendorer"
 end
 
 # Gems needed for running tests
 group :test do
   gem "minitest", "~> 5.1", :platforms => [:ruby_19, :ruby_20]

+  gem "rails-controller-testing"

   gem "rubocop"
   gem "rubocop"

-  gem "timecop"

   gem "webmock"
 end
 
 # Needed in development as well so rake can see konacha tasks
 group :development, :test do
   gem "webmock"
 end
 
 # Needed in development as well so rake can see konacha tasks
 group :development, :test do

+  gem "capybara", "~> 2.13"

   gem "coveralls", :require => false
   gem "coveralls", :require => false

-  gem "factory_girl_rails"
+  gem "factory_bot_rails"

   gem "jshint"
   gem "jshint"

-  gem "konacha"

   gem "poltergeist"
   gem "poltergeist"

+  gem "puma", "~> 3.7"

 end
 end