From: Tom Hughes <tom@compton.nu>
Date: Tue, 16 Nov 2021 08:25:09 +0000 (+0000)
Subject: Update bundle
X-Git-Tag: live~2318
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/7b1e78e2473adc365f2ef8c72b47115710db8556

Update bundle
---

diff --git a/Gemfile b/Gemfile
index 3df9bc7eb..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"
 
@@ -43,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"
diff --git a/Gemfile.lock b/Gemfile.lock
index 7d510c09c..a4114d4d7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -80,8 +80,8 @@ GEM
     autoprefixer-rails (10.3.3.0)
       execjs (~> 2)
     aws-eventstream (1.2.0)
-    aws-partitions (1.525.0)
-    aws-sdk-core (3.122.0)
+    aws-partitions (1.530.0)
+    aws-sdk-core (3.122.1)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.525.0)
       aws-sigv4 (~> 1.1)
@@ -262,7 +262,7 @@ GEM
       ruby-vips (>= 2.0.17, < 3)
     image_size (3.0.1)
     in_threads (1.5.4)
-    jbuilder (2.11.2)
+    jbuilder (2.11.3)
       activesupport (>= 5.0.0)
     jmespath (1.4.0)
     jquery-rails (4.4.0)
@@ -414,7 +414,7 @@ GEM
     rexml (3.2.5)
     rinku (2.0.6)
     rotp (6.2.0)
-    rubocop (1.22.3)
+    rubocop (1.23.0)
       parallel (~> 1.10)
       parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
@@ -425,7 +425,7 @@ GEM
       unicode-display_width (>= 1.4.0, < 3.0)
     rubocop-ast (1.13.0)
       parser (>= 3.0.1.1)
-    rubocop-minitest (0.15.2)
+    rubocop-minitest (0.16.0)
       rubocop (>= 0.90, < 2.0)
     rubocop-performance (1.12.0)
       rubocop (>= 1.7.0, < 2.0)
@@ -468,9 +468,9 @@ GEM
     sprockets (4.0.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.2.2)
-      actionpack (>= 4.0)
-      activesupport (>= 4.0)
+    sprockets-rails (3.3.0)
+      actionpack (>= 5.2)
+      activesupport (>= 5.2)
       sprockets (>= 3.0.0)
     strong_migrations (0.7.8)
       activerecord (>= 5)
@@ -518,7 +518,7 @@ DEPENDENCIES
   cancancan
   canonical-rails
   capybara (>= 2.15)
-  composite_primary_keys (~> 13.0.0)
+  composite_primary_keys (~> 13.0.0, != 13.0.1)
   config
   connection_pool
   dalli
@@ -579,6 +579,7 @@ DEPENDENCIES
   selenium-webdriver (~> 3.142.7)
   simplecov
   simplecov-lcov
+  sprockets-rails (< 3.4.0)
   strong_migrations
   terser
   validates_email_format_of (>= 1.5.1)