From 3d01278b143e8438353969be5c963866d672b27e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 13 Jul 2024 18:42:56 +0000 Subject: [PATCH 1/4] Bump good_job from 3.30.0 to 4.0.3 Bumps [good_job](https://github.com/bensheldon/good_job) from 3.30.0 to 4.0.3. - [Release notes](https://github.com/bensheldon/good_job/releases) - [Changelog](https://github.com/bensheldon/good_job/blob/main/CHANGELOG.md) - [Commits](https://github.com/bensheldon/good_job/compare/v3.30.0...v4.0.3) --- updated-dependencies: - dependency-name: good_job dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- Gemfile | 2 +- Gemfile.lock | 26 ++++++++++++-------------- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/Gemfile b/Gemfile index f39baf7a..9681404e 100644 --- a/Gemfile +++ b/Gemfile @@ -15,7 +15,7 @@ gem 'active_model_serializers', '~> 0.10' gem 'bcrypt', '~> 3.1' # Use GoodJob as our Active Job queue adapter -gem 'good_job', '~> 3.30' +gem 'good_job', '~> 4.0' gem 'wahwah', '~> 1.6.2' diff --git a/Gemfile.lock b/Gemfile.lock index 666b4d57..00f395ef 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -119,13 +119,13 @@ GEM raabro (~> 1.4) globalid (1.2.1) activesupport (>= 6.1) - good_job (3.30.0) - activejob (>= 6.0.0) - activerecord (>= 6.0.0) - concurrent-ruby (>= 1.0.2) - fugit (>= 1.1) - railties (>= 6.0.0) - thor (>= 0.14.1) + good_job (4.0.3) + activejob (>= 6.1.0) + activerecord (>= 6.1.0) + concurrent-ruby (>= 1.3.1) + fugit (>= 1.11.0) + railties (>= 6.1.0) + thor (>= 1.0.0) has_scope (0.8.2) actionpack (>= 5.2) activesupport (>= 5.2) @@ -135,7 +135,7 @@ GEM mini_magick (>= 4.9.5, < 5) ruby-vips (>= 2.0.17, < 3) io-console (0.7.2) - irb (1.13.2) + irb (1.14.0) rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.7.2) @@ -153,7 +153,6 @@ GEM marcel (1.0.4) mini_magick (4.11.0) mini_mime (1.1.5) - mini_portile2 (2.8.7) minitest (5.24.1) mocha (2.4.0) ruby2_keywords (>= 0.0.5) @@ -169,8 +168,7 @@ GEM net-smtp (0.5.0) net-protocol nio4r (2.7.3) - nokogiri (1.16.6) - mini_portile2 (~> 2.8.2) + nokogiri (1.16.6-x86_64-linux) racc (~> 1.4) parallel (1.25.1) parser (3.3.4.0) @@ -186,7 +184,7 @@ GEM activesupport (>= 3.0.0) raabro (1.4.0) racc (1.8.0) - rack (3.1.6) + rack (3.1.7) rack-cors (2.0.2) rack (>= 2.0.0) rack-session (2.0.0) @@ -291,7 +289,7 @@ GEM zeitwerk (2.6.16) PLATFORMS - ruby + x86_64-linux DEPENDENCIES active_model_serializers (~> 0.10) @@ -302,7 +300,7 @@ DEPENDENCIES debug (~> 1.9) factory_bot_rails (~> 6.4) faker (~> 3.4) - good_job (~> 3.30) + good_job (~> 4.0) has_scope (~> 0.8) image_processing (~> 1.12.2) mocha (~> 2.4.0) From 8ebf8a47d1acc9372081f614a2b81f33e2f6d4bb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Sat, 13 Jul 2024 18:43:38 +0000 Subject: [PATCH 2/4] Update gemset.nix --- gemset.nix | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/gemset.nix b/gemset.nix index b8881700..6c995596 100644 --- a/gemset.nix +++ b/gemset.nix @@ -388,10 +388,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "189xdgqgiqmzjz13jrjsysgm10kdakfvn85w8qdpack6ig2993xv"; + sha256 = "1y021rc268xaxqdxs1cpkxjl2q4wc8l1fgc3xgk6ga3ms9rk3dai"; type = "gem"; }; - version = "3.30.0"; + version = "4.0.3"; }; has_scope = { dependencies = ["actionpack" "activesupport"]; @@ -442,10 +442,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05w1vv6bcgf3b3v8xys94i09g01qwpxwlzlnd3c5qlbs0kc2hag7"; + sha256 = "05g6vpz3997q4j3xhrliswfx3g5flsn5cfn1p1s4h6dx7c0hbn2k"; type = "gem"; }; - version = "1.13.2"; + version = "1.14.0"; }; json = { groups = ["default" "development"]; @@ -539,16 +539,6 @@ }; version = "1.1.5"; }; - mini_portile2 = { - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1q1f2sdw3y3y9mnym9dhjgsjr72sq975cfg5c4yx7gwv8nmzbvhk"; - type = "gem"; - }; - version = "2.8.7"; - }; minitest = { groups = ["default" "development" "test"]; platforms = []; @@ -645,7 +635,7 @@ version = "2.7.3"; }; nokogiri = { - dependencies = ["mini_portile2" "racc"]; + dependencies = ["racc"]; groups = ["default" "development" "test"]; platforms = []; source = { @@ -754,10 +744,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ciwz1mjx40lr0l06xhpdmhb76xf7haq7m360jxj7hn94lvmgk88"; + sha256 = "12z55b90vvr4sh93az2yfr3fg91jivsag8lcg0k360d99vdq568f"; type = "gem"; }; - version = "3.1.6"; + version = "3.1.7"; }; rack-cors = { dependencies = ["rack"]; From e54d7f92c383764a389c2414812d59b1f103d7e1 Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Sat, 13 Jul 2024 20:46:34 +0200 Subject: [PATCH 3/4] Revert dependabot platform changes --- Gemfile.lock | 10 ++++++---- gemset.nix | 20 +++++++++++++++----- 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 00f395ef..3f9e03b0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -135,7 +135,7 @@ GEM mini_magick (>= 4.9.5, < 5) ruby-vips (>= 2.0.17, < 3) io-console (0.7.2) - irb (1.14.0) + irb (1.13.2) rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.7.2) @@ -153,6 +153,7 @@ GEM marcel (1.0.4) mini_magick (4.11.0) mini_mime (1.1.5) + mini_portile2 (2.8.7) minitest (5.24.1) mocha (2.4.0) ruby2_keywords (>= 0.0.5) @@ -168,7 +169,8 @@ GEM net-smtp (0.5.0) net-protocol nio4r (2.7.3) - nokogiri (1.16.6-x86_64-linux) + nokogiri (1.16.6) + mini_portile2 (~> 2.8.2) racc (~> 1.4) parallel (1.25.1) parser (3.3.4.0) @@ -184,7 +186,7 @@ GEM activesupport (>= 3.0.0) raabro (1.4.0) racc (1.8.0) - rack (3.1.7) + rack (3.1.6) rack-cors (2.0.2) rack (>= 2.0.0) rack-session (2.0.0) @@ -289,7 +291,7 @@ GEM zeitwerk (2.6.16) PLATFORMS - x86_64-linux + ruby DEPENDENCIES active_model_serializers (~> 0.10) diff --git a/gemset.nix b/gemset.nix index 6c995596..527994b3 100644 --- a/gemset.nix +++ b/gemset.nix @@ -442,10 +442,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05g6vpz3997q4j3xhrliswfx3g5flsn5cfn1p1s4h6dx7c0hbn2k"; + sha256 = "05w1vv6bcgf3b3v8xys94i09g01qwpxwlzlnd3c5qlbs0kc2hag7"; type = "gem"; }; - version = "1.14.0"; + version = "1.13.2"; }; json = { groups = ["default" "development"]; @@ -539,6 +539,16 @@ }; version = "1.1.5"; }; + mini_portile2 = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1q1f2sdw3y3y9mnym9dhjgsjr72sq975cfg5c4yx7gwv8nmzbvhk"; + type = "gem"; + }; + version = "2.8.7"; + }; minitest = { groups = ["default" "development" "test"]; platforms = []; @@ -635,7 +645,7 @@ version = "2.7.3"; }; nokogiri = { - dependencies = ["racc"]; + dependencies = ["mini_portile2" "racc"]; groups = ["default" "development" "test"]; platforms = []; source = { @@ -744,10 +754,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12z55b90vvr4sh93az2yfr3fg91jivsag8lcg0k360d99vdq568f"; + sha256 = "0ciwz1mjx40lr0l06xhpdmhb76xf7haq7m360jxj7hn94lvmgk88"; type = "gem"; }; - version = "3.1.7"; + version = "3.1.6"; }; rack-cors = { dependencies = ["rack"]; From 6f87598f865cbefd16982777ff78d715e6e1aa9c Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Sat, 13 Jul 2024 20:46:51 +0200 Subject: [PATCH 4/4] Smaller number is higher priority is the default now --- config/initializers/good_job.rb | 3 --- 1 file changed, 3 deletions(-) diff --git a/config/initializers/good_job.rb b/config/initializers/good_job.rb index 37c4df71..aca5ef25 100644 --- a/config/initializers/good_job.rb +++ b/config/initializers/good_job.rb @@ -1,9 +1,6 @@ # frozen_string_literal: true Rails.application.configure do - # Opt-in to default behaviour for priority in Active Job - # See: https://github.com/bensheldon/good_job/pull/883 - config.good_job.smaller_number_is_higher_priority = true # GoodJob recurring jobs # See https://github.com/bensheldon/good_job#cron-style-repeatingrecurring-jobs config.good_job.enable_cron = true