diff --git a/Gemfile b/Gemfile index b3d0a818d5e..7af47881b75 100644 --- a/Gemfile +++ b/Gemfile @@ -82,7 +82,7 @@ gem 'rqrcode', '~> 3.0' gem 'ruby-progressbar', '~> 1.13' gem 'sanitize', '~> 7.0' gem 'scenic', '~> 1.7' -gem 'sidekiq', '< 8' +gem 'sidekiq', '< 9' gem 'sidekiq-bulk', '~> 0.2.0' gem 'sidekiq-scheduler', '~> 6.0' gem 'sidekiq-unique-jobs', '> 8' diff --git a/Gemfile.lock b/Gemfile.lock index 464d5bd2c97..b0bf819481f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -823,12 +823,12 @@ GEM securerandom (0.4.1) shoulda-matchers (6.5.0) activesupport (>= 5.2.0) - sidekiq (7.3.9) - base64 - connection_pool (>= 2.3.0) - logger - rack (>= 2.2.4) - redis-client (>= 0.22.2) + sidekiq (8.0.7) + connection_pool (>= 2.5.0) + json (>= 2.9.0) + logger (>= 1.6.2) + rack (>= 3.1.0) + redis-client (>= 0.23.2) sidekiq-bulk (0.2.0) sidekiq sidekiq-scheduler (6.0.1) @@ -1077,7 +1077,7 @@ DEPENDENCIES sanitize (~> 7.0) scenic (~> 1.7) shoulda-matchers - sidekiq (< 8) + sidekiq (< 9) sidekiq-bulk (~> 0.2.0) sidekiq-scheduler (~> 6.0) sidekiq-unique-jobs (> 8) diff --git a/README.md b/README.md index 12027289659..5c0e596b727 100644 --- a/README.md +++ b/README.md @@ -58,7 +58,7 @@ Mastodon is a **free, open-source social network server** based on [ActivityPub] - **Ruby** 3.2+ - **PostgreSQL** 13+ -- **Redis** 6.2+ +- **Redis** 7.0+ - **Node.js** 20+ This repository includes deployment configurations for **Docker and docker-compose**, as well as for other environments like Heroku and Scalingo. For Helm charts, reference the [mastodon/chart repository](https://github.com/mastodon/chart). A [**standalone** installation guide](https://docs.joinmastodon.org/admin/install/) is available in the main documentation. diff --git a/app/workers/concerns/bulk_mailing_concern.rb b/app/workers/concerns/bulk_mailing_concern.rb index 5f8154d7fa6..98fcc0541df 100644 --- a/app/workers/concerns/bulk_mailing_concern.rb +++ b/app/workers/concerns/bulk_mailing_concern.rb @@ -7,7 +7,7 @@ module BulkMailingConcern job_class = ActionMailer::MailDeliveryJob Sidekiq::Client.push_bulk({ - 'class' => ActiveJob::QueueAdapters::SidekiqAdapter::JobWrapper, + 'class' => Sidekiq::ActiveJob::Wrapper, 'wrapped' => job_class, 'queue' => mailer_class.deliver_later_queue_name, 'args' => args_array.map do |args|