X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/2b2264ddab13ee8ffa7e90d8b803d1a0296a7cff..12e22c5de32d287f43ccdc428a2fb13406f0fefb:/Gemfile diff --git a/Gemfile b/Gemfile index b5547dc9f..0d31318b8 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source "https://rubygems.org" # Require rails -gem "rails", "4.2.1" +gem "rails", "4.2.2" # Sprockets 3 seems to be buggy, so stick with 2 for now gem "sprockets", "~> 2.12.3" @@ -50,7 +50,7 @@ gem "composite_primary_keys", "~> 8.1.0" gem "http_accept_language", "~> 2.0.0" gem "paperclip", "~> 4.0" gem "deadlock_retry", ">= 1.2.0" -gem "openstreetmap-i18n-js", ">= 3.0.0.rc5.3", :require => "i18n-js" +gem "i18n-js", ">= 3.0.0.rc10" gem "rack-cors" gem "actionpack-page_caching"