X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/0814b4096c443e2ab3c09baa058aa81a00d205d1..124ec2e9d560e0df291e5a8e5aa67ef5db2f5d46:/Gemfile diff --git a/Gemfile b/Gemfile index c2578d6f5..278167d66 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source "https://rubygems.org" # Require rails -gem "rails", "4.2.7.1" +gem "rails", "4.2.8" # Require things which have moved to gems in ruby 1.9 gem "bigdecimal", "~> 1.1.0", :platforms => :ruby_19 @@ -46,7 +46,7 @@ gem "composite_primary_keys", "~> 8.1.0" gem "deadlock_retry", ">= 1.2.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 "paperclip", "~> 4.0" gem "rack-cors" @@ -92,6 +92,12 @@ gem "rotp" 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" @@ -103,7 +109,6 @@ end # Gems needed for running tests group :test do gem "minitest", "~> 5.1", :platforms => [:ruby_19, :ruby_20] - gem "minitest-stub_any_instance" gem "rubocop" gem "timecop" gem "webmock"