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

[rails.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index 04395b49a6d1b760c15574b8043c436cf5e924ba..fcf2ceb4d1df6f381344c20479b8aaf45e10b19c 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -63,14 +63,16 @@ gem "oauth-plugin", ">= 0.5.1"
 gem "openstreetmap-deadlock_retry", ">= 1.3.1", :require => "deadlock_retry"
 gem "rack-cors"
 gem "rails-i18n", "~> 7.0.0"
+gem "rails_param"
 gem "rinku", ">= 2.0.6", :require => "rails_rinku"
-gem "strong_migrations"
+gem "strong_migrations", "< 2.0.0"
 gem "validates_email_format_of", ">= 1.5.1"
 
 # Native OSM extensions
 gem "quad_tile", "~> 1.0.1"
 
 # Sanitise URIs
+gem "addressable", "~> 2.8"
 gem "rack-uri_sanitizer"
 
 # Omniauth for authentication
@@ -115,9 +117,6 @@ gem "connection_pool"
 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"