From: Tom Hughes Date: Tue, 19 Oct 2021 17:14:06 +0000 (+0100) Subject: Update bundle X-Git-Tag: live~1544 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/20a65b2b942dc0eb4705c9fc73065d4487fdcf20?ds=inline;hp=89856701f450831dc8b1c2eae20d8ae4b98279cf Update bundle --- diff --git a/Gemfile b/Gemfile index 75cb1054b..17f6cc791 100644 --- a/Gemfile +++ b/Gemfile @@ -96,6 +96,7 @@ gem "maxminddb" gem "rotp" # Load memcache client in case we are using it +gem "connection_pool" gem "dalli" gem "kgio" @@ -147,7 +148,7 @@ group :test do gem "rubocop-performance" gem "rubocop-rails", "~> 2.11.3" # Bug in 2.12.0, fixed in master after 2.12.2 gem "rubocop-rake" - gem "selenium-webdriver" + gem "selenium-webdriver", "~> 3.142.7" gem "simplecov", :require => false gem "simplecov-lcov", :require => false gem "webmock" diff --git a/Gemfile.lock b/Gemfile.lock index 4f7f64b99..1551295dd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -77,17 +77,17 @@ GEM autoprefixer-rails (10.3.3.0) execjs (~> 2) aws-eventstream (1.2.0) - aws-partitions (1.513.0) - aws-sdk-core (3.121.1) + aws-partitions (1.516.0) + aws-sdk-core (3.121.2) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-kms (1.49.0) - aws-sdk-core (~> 3, >= 3.120.0) + aws-sdk-kms (1.50.0) + aws-sdk-core (~> 3, >= 3.121.2) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.103.0) - aws-sdk-core (~> 3, >= 3.120.0) + aws-sdk-s3 (1.104.0) + aws-sdk-core (~> 3, >= 3.121.2) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.4) aws-sigv4 (1.4.0) @@ -139,10 +139,11 @@ GEM config (3.1.0) deep_merge (~> 1.2, >= 1.2.1) dry-validation (~> 1.0, >= 1.0.0) + connection_pool (2.2.5) crack (0.4.5) rexml crass (1.0.6) - dalli (2.7.11) + dalli (3.0.2) debug_inspector (1.1.0) deep_merge (1.2.1) delayed_job (4.1.9) @@ -261,7 +262,7 @@ GEM rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - json (2.5.1) + json (2.6.0) jwt (2.3.0) kgio (2.11.4) kramdown (2.3.1) @@ -345,11 +346,11 @@ GEM popper_js (1.16.0) progress (3.6.0) public_suffix (4.0.6) - puma (5.5.1) + puma (5.5.2) nio4r (~> 2.0) quad_tile (1.0.1) r2 (0.2.7) - racc (1.5.2) + racc (1.6.0) rack (2.2.3) rack-cors (1.1.1) rack (>= 2.0.0) @@ -510,6 +511,7 @@ DEPENDENCIES capybara (>= 2.15) composite_primary_keys (~> 13.0.0) config + connection_pool dalli debug_inspector delayed_job_active_record @@ -565,7 +567,7 @@ DEPENDENCIES sanitize sassc-rails secure_headers - selenium-webdriver + selenium-webdriver (~> 3.142.7) simplecov simplecov-lcov strong_migrations