diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml index d086d3c52..ff61f1d97 100644 --- a/.github/workflows/ci-cd.yml +++ b/.github/workflows/ci-cd.yml @@ -126,7 +126,7 @@ jobs: rubocop_extensions: rubocop-performance:gemfile rubocop-rails:gemfile rubocop-rspec:gemfile rubocop-capybara:gemfile reporter: github-pr-review # Default is github-pr-check - run: yarn lint:frontend - - run: bundle exec bundle-audit check --update + - run: bundle exec bundle-audit check --update --ignore CVE-2023-26141 rspec: runs-on: ubuntu-latest diff --git a/Gemfile b/Gemfile index b89ca6ced..e44d7d8a2 100644 --- a/Gemfile +++ b/Gemfile @@ -97,9 +97,9 @@ gem "rouge", "~> 3.30" # A pure-ruby code highlighter gem "rss", "~> 0.2.9" # Ruby's standard library for RSS gem "rubyzip", "~> 2.3" # Rubyzip is a ruby library for reading and writing zip files gem "s3_direct_upload", "~> 0.1" # Direct Upload to Amazon S3 -gem "sidekiq", "~> 7.1.4" # Sidekiq is used to process background jobs with the help of Redis +gem "sidekiq", "~> 6.5.3" # Sidekiq is used to process background jobs with the help of Redis gem "sidekiq-cron", "~> 1.7" # Allows execution of scheduled cron jobs as specific times -gem "sidekiq-unique-jobs", "~> 8.0.3" # Ensures that Sidekiq jobs are unique when enqueued +gem "sidekiq-unique-jobs", "~> 7.1.27" # Ensures that Sidekiq jobs are unique when enqueued gem "slack-notifier", "~> 2.4" # A slim ruby wrapper for posting to slack webhooks gem "sprockets-rails", "~> 3.4" # Sprockets Rails integration gem "staccato", "~> 0.5" # Ruby Google Analytics Measurement diff --git a/Gemfile.lock b/Gemfile.lock index 430d0807e..22669d93a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -680,8 +680,6 @@ GEM actionpack (>= 5, < 8) redis-rack (>= 2.1.0, < 3) redis-store (>= 1.1.0, < 2) - redis-client (0.17.0) - connection_pool redis-rack (2.1.4) rack (>= 2.0.8, < 3) redis-store (>= 1.2, < 2) @@ -825,20 +823,20 @@ GEM shellany (0.0.1) shoulda-matchers (5.3.0) activesupport (>= 5.2.0) - sidekiq (7.1.4) - concurrent-ruby (< 2) - connection_pool (>= 2.3.0) - rack (>= 2.2.4) - redis-client (>= 0.14.0) + sidekiq (6.5.9) + connection_pool (>= 2.2.5, < 3) + rack (~> 2.0) + redis (>= 4.5.0, < 5) sidekiq-cron (1.10.1) fugit (~> 1.8) globalid (>= 1.0.1) sidekiq (>= 6) - sidekiq-unique-jobs (8.0.3) + sidekiq-unique-jobs (7.1.30) brpoplpush-redis_script (> 0.1.1, <= 2.0.0) concurrent-ruby (~> 1.0, >= 1.0.5) - sidekiq (>= 7.0.0, < 8.0.0) - thor (>= 1.0, < 3.0) + redis (< 5.0) + sidekiq (>= 5.0, < 7.0) + thor (>= 0.20, < 3.0) simple_oauth (0.3.1) simplecov (0.21.2) docile (~> 1.1) @@ -1098,9 +1096,9 @@ DEPENDENCIES s3_direct_upload (~> 0.1) sassc-rails (~> 2.1.2) shoulda-matchers (~> 5.3) - sidekiq (~> 7.1.4) + sidekiq (~> 6.5.3) sidekiq-cron (~> 1.7) - sidekiq-unique-jobs (~> 8.0.3) + sidekiq-unique-jobs (~> 7.1.27) simplecov (~> 0.21.2) slack-notifier (~> 2.4) solargraph (~> 0.45) diff --git a/app/controllers/page_views_controller.rb b/app/controllers/page_views_controller.rb index 6ee915642..671cd99c6 100644 --- a/app/controllers/page_views_controller.rb +++ b/app/controllers/page_views_controller.rb @@ -24,7 +24,7 @@ class PageViewsController < ApplicationMetalController Articles::UpdatePageViewsWorker.perform_at( 2.minutes.from_now, - page_view_create_params.to_h, + page_view_create_params, ) head :ok diff --git a/vendor/cache/redis-client-0.17.0.gem b/vendor/cache/redis-client-0.17.0.gem deleted file mode 100644 index 92197a75e..000000000 Binary files a/vendor/cache/redis-client-0.17.0.gem and /dev/null differ diff --git a/vendor/cache/sidekiq-6.5.9.gem b/vendor/cache/sidekiq-6.5.9.gem new file mode 100644 index 000000000..c8df643ce Binary files /dev/null and b/vendor/cache/sidekiq-6.5.9.gem differ diff --git a/vendor/cache/sidekiq-7.1.4.gem b/vendor/cache/sidekiq-7.1.4.gem deleted file mode 100644 index a102b18e2..000000000 Binary files a/vendor/cache/sidekiq-7.1.4.gem and /dev/null differ diff --git a/vendor/cache/sidekiq-unique-jobs-7.1.30.gem b/vendor/cache/sidekiq-unique-jobs-7.1.30.gem new file mode 100644 index 000000000..c97fc9e50 Binary files /dev/null and b/vendor/cache/sidekiq-unique-jobs-7.1.30.gem differ diff --git a/vendor/cache/sidekiq-unique-jobs-8.0.3.gem b/vendor/cache/sidekiq-unique-jobs-8.0.3.gem deleted file mode 100644 index 65bbfedbd..000000000 Binary files a/vendor/cache/sidekiq-unique-jobs-8.0.3.gem and /dev/null differ