From: Tom Hughes Date: Mon, 22 Nov 2021 20:52:16 +0000 (+0000) Subject: Update bundle X-Git-Tag: live~1414 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/cd1dcad31a2b7e08bf531801d099b7624e8d2107 Update bundle --- diff --git a/Gemfile b/Gemfile index c4d611430..108f44971 100644 --- a/Gemfile +++ b/Gemfile @@ -24,9 +24,6 @@ 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" diff --git a/Gemfile.lock b/Gemfile.lock index a4114d4d7..cfe9a25bf 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -80,7 +80,7 @@ GEM autoprefixer-rails (10.3.3.0) execjs (~> 2) aws-eventstream (1.2.0) - aws-partitions (1.530.0) + aws-partitions (1.534.0) aws-sdk-core (3.122.1) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.525.0) @@ -89,7 +89,7 @@ GEM aws-sdk-kms (1.51.0) aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.105.1) + aws-sdk-s3 (1.106.0) aws-sdk-core (~> 3, >= 3.122.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.4) @@ -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.16.0) + rubocop-minitest (0.17.0) rubocop (>= 0.90, < 2.0) rubocop-performance (1.12.0) rubocop (>= 1.7.0, < 2.0) @@ -438,7 +438,7 @@ GEM rubocop (~> 1.0) ruby-openid (2.9.2) ruby-progressbar (1.11.0) - ruby-vips (2.1.3) + ruby-vips (2.1.4) ffi (~> 1.12) ruby2_keywords (0.0.5) rubyzip (2.3.2) @@ -468,7 +468,7 @@ GEM sprockets (4.0.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-rails (3.3.0) + sprockets-rails (3.4.1) actionpack (>= 5.2) activesupport (>= 5.2) sprockets (>= 3.0.0) @@ -579,7 +579,6 @@ DEPENDENCIES selenium-webdriver (~> 3.142.7) simplecov simplecov-lcov - sprockets-rails (< 3.4.0) strong_migrations terser validates_email_format_of (>= 1.5.1)