Merge remote-tracking branch 'upstream/pull/3445'

[rails.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index 15348a9898a49b4572ab231f7625c479a93e0ba9..7bb5d705452c52e8fdbc0d062e6d7bef4ef1cce2 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,7 @@
 source "https://rubygems.org"
 
 # Require rails
 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"
 
 # Require json for multi_json
 gem "json"


@@ -149,7 +149,7 @@ group :test do
   gem "rubocop"
   gem "rubocop-minitest"
   gem "rubocop-performance"
   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
   gem "rubocop-rake"
   gem "selenium-webdriver", "~> 3.142.7"
   gem "simplecov", :require => false