X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/4d406fcdfd9b0b50b1bc9c53d26ca91cd5944532..554ff7824ad6e9596f9cb91e39fdbf097a6274b4:/Gemfile diff --git a/Gemfile b/Gemfile index 8387097fe..fee5fa4d1 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source "https://rubygems.org" # Require rails -gem "rails", "5.0.6" +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,7 +42,7 @@ gem "image_optim_rails" # Load rails plugins gem "actionpack-page_caching" -gem "composite_primary_keys", "~> 9.0.7" +gem "composite_primary_keys", "~> 10.0.0" gem "dynamic_form" gem "http_accept_language", "~> 2.0.0" gem "i18n-js", ">= 3.0.0" @@ -120,7 +120,7 @@ end # Needed in development as well so rake can see konacha tasks group :development, :test do gem "coveralls", :require => false - gem "factory_girl_rails" + gem "factory_bot_rails" gem "jshint" # gem "konacha" gem "poltergeist"