Merge remote-tracking branch 'openstreetmap/pull/1553'

[rails.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index 85f1a87e4bc369fb80197b1ba272309af1f11881..278167d6611943d97360516ec4eaa78dea31fb58 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -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"