From e2f66ea8c79ae2d88f1e81995e09cff5d189b3a2 Mon Sep 17 00:00:00 2001 From: Melissa Jimenez Date: Mon, 12 Feb 2024 22:50:58 -0500 Subject: [PATCH 1/6] AO3-6630: Update newrelic_rpm gem to 9.6.0 --- Gemfile.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 413b9392b37..c31864b3651 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -352,7 +352,7 @@ GEM rake mini_mime (1.1.2) mini_portile2 (2.8.2) - minitest (5.17.0) + minitest (5.3.3) mono_logger (1.1.2) multi_json (1.15.0) multi_test (0.1.2) @@ -373,7 +373,7 @@ GEM net-ssh-gateway (2.0.0) net-ssh (>= 4.0.0) netrc (0.11.0) - newrelic_rpm (8.16.0) + newrelic_rpm (9.6.0) nio4r (2.5.8) nokogiri (1.14.3) mini_portile2 (~> 2.8.0) @@ -496,7 +496,7 @@ GEM rspec-mocks (~> 3.10) rspec-support (~> 3.10) rspec-support (3.10.3) - rubocop (1.22.1) + rubocop (1.54) parallel (~> 1.10) parser (>= 3.0.0.0) rainbow (>= 2.2.2, < 4.0) @@ -505,7 +505,7 @@ GEM rubocop-ast (>= 1.12.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.15.2) + rubocop-ast (1.28.1) parser (>= 3.0.1.1) rubocop-rails (2.12.4) activesupport (>= 4.2.0) @@ -682,7 +682,7 @@ DEPENDENCIES rest-client (~> 2.1.0) rollout rspec-rails (~> 4.0.1) - rubocop (= 1.22.1) + rubocop (= 1.54) rubocop-rails (= 2.12.4) rubocop-rspec (= 2.6.0) rvm-capistrano From 8d47ce26b6645bfccb2d3bd8a15cdfbe083bbc6f Mon Sep 17 00:00:00 2001 From: Melissa Jimenez Date: Mon, 12 Feb 2024 22:55:17 -0500 Subject: [PATCH 2/6] AO3-6630: Update newrelic_rpm gem to 9.6.0 fix --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index c31864b3651..0b69b3ae079 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -496,7 +496,7 @@ GEM rspec-mocks (~> 3.10) rspec-support (~> 3.10) rspec-support (3.10.3) - rubocop (1.54) + rubocop (= 1.22.1) parallel (~> 1.10) parser (>= 3.0.0.0) rainbow (>= 2.2.2, < 4.0) @@ -682,7 +682,7 @@ DEPENDENCIES rest-client (~> 2.1.0) rollout rspec-rails (~> 4.0.1) - rubocop (= 1.54) + rubocop (= 1.22.1) rubocop-rails (= 2.12.4) rubocop-rspec (= 2.6.0) rvm-capistrano From d90899cf9fbdeacdc38bc792cfe90137aaf94d74 Mon Sep 17 00:00:00 2001 From: Melissa Jimenez Date: Mon, 12 Feb 2024 23:01:35 -0500 Subject: [PATCH 3/6] AO3-6630: Update newrelic_rpm gem to 9.6.0 fix --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index f8280b5d433..10b7048c74e 100644 --- a/Gemfile +++ b/Gemfile @@ -158,7 +158,7 @@ end group :linters do gem "erb_lint", "0.4.0" - gem "rubocop", "1.22.1" + gem "rubocop", "1.54" gem "rubocop-rails", "2.12.4" gem "rubocop-rspec", "2.6.0" end From daeb1b81538026ab5084fb85e31f8c8b1506ceb2 Mon Sep 17 00:00:00 2001 From: Melissa Jimenez Date: Mon, 12 Feb 2024 23:04:08 -0500 Subject: [PATCH 4/6] AO3-6630: Update newrelic_rpm gem to 9.6.0 fix --- Gemfile.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 0b69b3ae079..cdae3fe7fd7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -352,7 +352,7 @@ GEM rake mini_mime (1.1.2) mini_portile2 (2.8.2) - minitest (5.3.3) + minitest (5.17.0) mono_logger (1.1.2) multi_json (1.15.0) multi_test (0.1.2) @@ -496,7 +496,7 @@ GEM rspec-mocks (~> 3.10) rspec-support (~> 3.10) rspec-support (3.10.3) - rubocop (= 1.22.1) + rubocop (1.22.1) parallel (~> 1.10) parser (>= 3.0.0.0) rainbow (>= 2.2.2, < 4.0) @@ -505,7 +505,7 @@ GEM rubocop-ast (>= 1.12.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.28.1) + rubocop-ast (1.15.2) parser (>= 3.0.1.1) rubocop-rails (2.12.4) activesupport (>= 4.2.0) From 9604bbf5663bac82cfdceaf8fc819b1be30b2249 Mon Sep 17 00:00:00 2001 From: Melissa Jimenez Date: Mon, 12 Feb 2024 23:05:08 -0500 Subject: [PATCH 5/6] AO3-6630: Update newrelic_rpm gem to 9.6.0 fix --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 10b7048c74e..f8280b5d433 100644 --- a/Gemfile +++ b/Gemfile @@ -158,7 +158,7 @@ end group :linters do gem "erb_lint", "0.4.0" - gem "rubocop", "1.54" + gem "rubocop", "1.22.1" gem "rubocop-rails", "2.12.4" gem "rubocop-rspec", "2.6.0" end From 1fc1be61025482c01e5d3bf9e4c17fdd2cc61193 Mon Sep 17 00:00:00 2001 From: Melissa Jimenez Date: Mon, 12 Feb 2024 23:09:37 -0500 Subject: [PATCH 6/6] AO3-6134: Replace Delorean gem with TimeHelpers fix --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index cdae3fe7fd7..b47f0243faf 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -373,7 +373,7 @@ GEM net-ssh-gateway (2.0.0) net-ssh (>= 4.0.0) netrc (0.11.0) - newrelic_rpm (9.6.0) + newrelic_rpm (9.7.1) nio4r (2.5.8) nokogiri (1.14.3) mini_portile2 (~> 2.8.0)