X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/20a65b2b942dc0eb4705c9fc73065d4487fdcf20..87bf5648c8df1640cd6de8a75aa93686751abe18:/Gemfile

diff --git a/Gemfile b/Gemfile
index 17f6cc791..c4d611430 100644
--- a/Gemfile
+++ b/Gemfile
@@ -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"
@@ -146,7 +152,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