X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/aad81eb74c9e6d70971f938da542271b8a70b638..d257c217405efb042b1507c3d134f3912e0e7a98:/Gemfile diff --git a/Gemfile b/Gemfile index 15348a989..7ee75cb66 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source "https://rubygems.org" # Require rails -gem "rails", "6.1.4.1" +gem "rails", "6.1.4.4" # Require json for multi_json gem "json" @@ -43,7 +43,7 @@ gem "active_record_union" gem "bootstrap", "~> 4.5.0" gem "bootstrap_form", "~> 4.0" gem "cancancan" -gem "composite_primary_keys", "~> 13.0.0" +gem "composite_primary_keys", "~> 13.0.0", "!= 13.0.1" gem "config" gem "delayed_job_active_record" gem "http_accept_language", "~> 2.1.1" @@ -149,7 +149,7 @@ group :test do gem "rubocop" gem "rubocop-minitest" gem "rubocop-performance" - gem "rubocop-rails", "~> 2.11.3" # Bug in 2.12.0, fixed in master after 2.12.2 + gem "rubocop-rails" gem "rubocop-rake" gem "selenium-webdriver", "~> 3.142.7" gem "simplecov", :require => false