X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/de3e02d41a9cb69352dc83ac8e478612777ebb24..f773f6795899c47ca5e48871678d7c5ee13dffc8:/Gemfile diff --git a/Gemfile b/Gemfile index f9b692353..772e6f300 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source "https://rubygems.org" # Require rails -gem "rails", "5.0.4" +gem "rails", "5.1.4" # Require things which have moved to gems in ruby 1.9 gem "bigdecimal", "~> 1.1.0", :platforms => :ruby_19 @@ -42,12 +42,12 @@ gem "image_optim_rails" # Load rails plugins gem "actionpack-page_caching" -gem "composite_primary_keys", "~> 9.0.7" -gem "deadlock_retry", ">= 1.2.0" +gem "composite_primary_keys", "~> 10.0.0" gem "dynamic_form" gem "http_accept_language", "~> 2.0.0" gem "i18n-js", ">= 3.0.0" gem "oauth-plugin", ">= 0.5.1" +gem "openstreetmap-deadlock_retry", ">= 1.3.0", :require => "deadlock_retry" gem "paperclip", "~> 4.0" gem "rack-cors" gem "rails-i18n", "~> 4.0.0"