gnh1201/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2025-09-05 17:31:12 +00:00
Code Issues Actions 34 Packages Projects Releases Wiki Activity

Update sidekiq to version 8.0.7 (#34824)
Some checks failed
Check i18n / check-i18n (push) Waiting to run
Details
CodeQL / Analyze (javascript) (push) Waiting to run
Details
CodeQL / Analyze (ruby) (push) Waiting to run
Details
Check formatting / lint (push) Waiting to run
Details
Ruby Testing / build (production) (push) Waiting to run
Details
Ruby Testing / build (test) (push) Waiting to run
Details
Ruby Testing / test (.ruby-version) (push) Blocked by required conditions
Details
Ruby Testing / test (3.2) (push) Blocked by required conditions
Details
Ruby Testing / test (3.3) (push) Blocked by required conditions
Details
Ruby Testing / ImageMagick tests (.ruby-version) (push) Blocked by required conditions
Details
Ruby Testing / ImageMagick tests (3.2) (push) Blocked by required conditions
Details
Ruby Testing / ImageMagick tests (3.3) (push) Blocked by required conditions
Details
Ruby Testing / End to End testing (.ruby-version) (push) Blocked by required conditions
Details
Ruby Testing / End to End testing (3.2) (push) Blocked by required conditions
Details
Ruby Testing / End to End testing (3.3) (push) Blocked by required conditions
Details
Ruby Testing / Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:7.17.13) (push) Blocked by required conditions
Details
Ruby Testing / Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:8.10.2) (push) Blocked by required conditions
Details
Ruby Testing / Elastic Search integration testing (.ruby-version, opensearchproject/opensearch:2) (push) Blocked by required conditions
Details
Ruby Testing / Elastic Search integration testing (3.2, docker.elastic.co/elasticsearch/elasticsearch:7.17.13) (push) Blocked by required conditions
Details
Ruby Testing / Elastic Search integration testing (3.3, docker.elastic.co/elasticsearch/elasticsearch:7.17.13) (push) Blocked by required conditions
Details
Bundler Audit / security (push) Has been cancelled
Details
Chromatic / Run Chromatic (push) Has been cancelled
Details
Crowdin / Upload translations / upload-translations (push) Has been cancelled
Details
CSS Linting / lint (push) Has been cancelled
Details
Haml Linting / lint (push) Has been cancelled
Details
JavaScript Linting / lint (push) Has been cancelled
Details
Ruby Linting / lint (push) Has been cancelled
Details
JavaScript Testing / test (push) Has been cancelled
Details
Historical data migration test / test (14-alpine) (push) Has been cancelled
Details
Historical data migration test / test (15-alpine) (push) Has been cancelled
Details
Historical data migration test / test (16-alpine) (push) Has been cancelled
Details
Historical data migration test / test (17-alpine) (push) Has been cancelled
Details

Browse Source
This commit is contained in:
Matt Jankowski 2025-08-14 11:25:31 -04:00 committed by GitHub
parent 651e51a82e
commit 4de21056ff
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@ -82,7 +82,7 @@ gem 'rqrcode', '~> 3.0'
gem 'ruby-progressbar', '~> 1.13' gem 'ruby-progressbar', '~> 1.13'
gem 'sanitize', '~> 7.0' gem 'sanitize', '~> 7.0'
gem 'scenic', '~> 1.7' gem 'scenic', '~> 1.7'
gem 'sidekiq', '< 8' gem 'sidekiq', '< 9'
gem 'sidekiq-bulk', '~> 0.2.0' gem 'sidekiq-bulk', '~> 0.2.0'
gem 'sidekiq-scheduler', '~> 6.0' gem 'sidekiq-scheduler', '~> 6.0'
gem 'sidekiq-unique-jobs', '> 8' gem 'sidekiq-unique-jobs', '> 8'

14
Gemfile.lock
View File

@ -823,12 +823,12 @@ GEM
securerandom (0.4.1) securerandom (0.4.1)
shoulda-matchers (6.5.0) shoulda-matchers (6.5.0)
activesupport (>= 5.2.0) activesupport (>= 5.2.0)
sidekiq (7.3.9) sidekiq (8.0.7)
base64 connection_pool (>= 2.5.0)
connection_pool (>= 2.3.0) json (>= 2.9.0)
logger logger (>= 1.6.2)
rack (>= 2.2.4) rack (>= 3.1.0)
redis-client (>= 0.22.2) redis-client (>= 0.23.2)
sidekiq-bulk (0.2.0) sidekiq-bulk (0.2.0)
sidekiq sidekiq
sidekiq-scheduler (6.0.1) sidekiq-scheduler (6.0.1)
@ -1077,7 +1077,7 @@ DEPENDENCIES
sanitize (~> 7.0) sanitize (~> 7.0)
scenic (~> 1.7) scenic (~> 1.7)
shoulda-matchers shoulda-matchers
sidekiq (< 8) sidekiq (< 9)
sidekiq-bulk (~> 0.2.0) sidekiq-bulk (~> 0.2.0)
sidekiq-scheduler (~> 6.0) sidekiq-scheduler (~> 6.0)
sidekiq-unique-jobs (> 8) sidekiq-unique-jobs (> 8)

2
README.md
View File

@ -58,7 +58,7 @@ Mastodon is a **free, open-source social network server** based on [ActivityPub]
- **Ruby** 3.2+ - **Ruby** 3.2+
- **PostgreSQL** 13+ - **PostgreSQL** 13+
- **Redis** 6.2+ - **Redis** 7.0+
- **Node.js** 20+ - **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. 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.

2
app/workers/concerns/bulk_mailing_concern.rb
View File

@ -7,7 +7,7 @@ module BulkMailingConcern
job_class = ActionMailer::MailDeliveryJob job_class = ActionMailer::MailDeliveryJob
Sidekiq::Client.push_bulk({ Sidekiq::Client.push_bulk({
'class' => ActiveJob::QueueAdapters::SidekiqAdapter::JobWrapper, 'class' => Sidekiq::ActiveJob::Wrapper,
'wrapped' => job_class, 'wrapped' => job_class,
'queue' => mailer_class.deliver_later_queue_name, 'queue' => mailer_class.deliver_later_queue_name,
'args' => args_array.map do |args| 'args' => args_array.map do |args|