Fix new rubocop warnings

[rails.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index 918a497477e761751b57edd1ff504151fa6f2c91..c4d6114303e5bd71b4f98bd64f8ddba8d4026591 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,7 @@
 source "https://rubygems.org"
 
 # Require rails
-gem "rails", "6.1.4"
+gem "rails", "6.1.4.1"
 
 # Require json for multi_json
 gem "json"
@@ -24,6 +24,9 @@ gem "jbuilder", "~> 2.7"
 # Reduces boot times through caching; required in config/boot.rb
 gem "bootsnap", ">= 1.4.2", :require => false
 
+# Block upgrades to sprockets-rails 3.4.0
+gem "sprockets-rails", "< 3.4.0"
+
 # Use R2 for RTL conversion
 gem "r2", "~> 0.2.7"
 
@@ -33,6 +36,9 @@ gem "autoprefixer-rails"
 # Use image_optim to optimise images
 gem "image_optim_rails"
 
+# Use argon2 for password hashing
+gem "argon2"
+
 # Load rails plugins
 gem "actionpack-page_caching", ">= 1.2.0"
 gem "activerecord-import"
@@ -40,7 +46,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"
@@ -96,6 +102,7 @@ gem "maxminddb"
 gem "rotp"
 
 # Load memcache client in case we are using it
+gem "connection_pool"
 gem "dalli"
 gem "kgio"
 
@@ -147,7 +154,7 @@ group :test do
   gem "rubocop-performance"
   gem "rubocop-rails"
   gem "rubocop-rake"
-  gem "selenium-webdriver"
+  gem "selenium-webdriver", "~> 3.142.7"
   gem "simplecov", :require => false
   gem "simplecov-lcov", :require => false
   gem "webmock"