From 548e9e6911481950001dde52fd39f9e2bdf1c212 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Mon, 2 Sep 2024 18:12:00 +0000
Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master

---
 .gitlab/ci/vendored-gems.gitlab-ci.yml        |   2 +-
 GITALY_SERVER_VERSION                         |   2 +-
 Gemfile                                       |   2 +-
 Gemfile.checksum                              |   2 +-
 Gemfile.lock                                  |  21 +-
 Gemfile.next.lock                             |  19 +-
 .../graphql_shared/possible_types.json        |   1 +
 .../issues/show/components/app.vue            |   5 +-
 .../issues/show/components/sticky_header.vue  |  60 +++-
 .../repository/components/commit_info.vue     |   2 +-
 .../ci/finished_pipeline_ch_sync_event.rb     |   8 +-
 app/models/user_preference.rb                 |  45 ---
 .../packages/maven/registry.rb                |  10 +
 app/views/projects/blame/_page.html.haml      |   2 +-
 config/gitlab_loose_foreign_keys.yml          |   8 +
 config/initializers/sidekiq.rb                |   2 +-
 db/docs/dast_site_profiles.yml                |   2 +-
 .../p_ci_finished_build_ch_sync_events.yml    |   3 +-
 db/docs/security_findings.yml                 |  10 +-
 ...lumn_to_ci_finished_build_ch_sync_event.rb |  15 +
 ...ojects_dast_site_profiles_project_id_fk.rb |  21 ++
 ...ished_build_ch_sync_event_on_project_id.rb |  21 ++
 db/schema_migrations/20240819102932           |   1 +
 db/schema_migrations/20240821154407           |   1 +
 db/schema_migrations/20240826155650           |   1 +
 db/structure.sql                              |   8 +-
 doc/api/graphql/reference/index.md            |  38 +++
 lib/gitlab/patch/sidekiq_cron_poller.rb       |   2 +-
 lib/gitlab/patch/sidekiq_job_setter.rb        |   2 +-
 .../show/components/sticky_header_spec.js     |  82 +++++-
 .../repository/components/commit_info_spec.js |   2 +
 .../sidekiq_server_middleware_spec.rb         |   2 +-
 .../database/no_cross_db_foreign_keys_spec.rb |   3 +-
 .../sidekiq_logging/structured_logger_spec.rb |  10 +-
 spec/models/user_preference_spec.rb           |  97 -------
 .../packages/maven/registry_spec.rb           |  17 ++
 spec/requests/api/graphql/ci/runners_spec.rb  |   2 +-
 .../handling_retried_jobs_shared_context.rb   |   2 +-
 .../structured_logger_shared_context.rb       |   8 +-
 ...ll_desired_sharding_key_shared_examples.rb |   6 +-
 .../have_loose_foreign_key.rb                 |   4 +-
 .../{sidekiq-7.2.4 => sidekiq}/.gitlab-ci.yml |   2 +-
 .../{sidekiq-7.2.4 => sidekiq}/Changes.md     |  43 +++
 .../gems/{sidekiq-7.2.4 => sidekiq}/Gemfile   |   0
 .../{sidekiq-7.2.4 => sidekiq}/Gemfile.lock   |   5 +-
 .../{sidekiq-7.2.4 => sidekiq}/LICENSE.txt    |   0
 .../{sidekiq-7.2.4 => sidekiq}/NOTICE.txt     |   3 +-
 .../gems/{sidekiq-7.2.4 => sidekiq}/README.md |   2 +-
 .../gems/{sidekiq-7.2.4 => sidekiq}/Rakefile  |   0
 .../bin/multi_queue_bench                     |   0
 .../{sidekiq-7.2.4 => sidekiq}/bin/sidekiq    |   0
 .../bin/sidekiqload                           |   0
 .../{sidekiq-7.2.4 => sidekiq}/bin/sidekiqmon |   0
 .../lib/generators/sidekiq/job_generator.rb   |   2 +
 .../generators/sidekiq/templates/job.rb.erb   |   0
 .../sidekiq/templates/job_spec.rb.erb         |   0
 .../sidekiq/templates/job_test.rb.erb         |   0
 .../{sidekiq-7.2.4 => sidekiq}/lib/sidekiq.rb |   3 +-
 .../lib/sidekiq/api.rb                        |  14 +-
 .../lib/sidekiq/capsule.rb                    |   5 +
 .../lib/sidekiq/cli.rb                        |   1 +
 .../lib/sidekiq/client.rb                     |   5 +-
 .../lib/sidekiq/component.rb                  |   0
 .../lib/sidekiq/config.rb                     |   8 +-
 .../lib/sidekiq/deploy.rb                     |   2 +
 .../lib/sidekiq/embedded.rb                   |   2 +
 .../lib/sidekiq/fetch.rb                      |   2 +-
 .../gems/sidekiq/lib/sidekiq/iterable_job.rb  |  55 ++++
 .../lib/sidekiq/job.rb                        |  15 +-
 .../lib/sidekiq/job/interrupt_handler.rb      |  24 ++
 .../gems/sidekiq/lib/sidekiq/job/iterable.rb  | 231 +++++++++++++++
 .../job/iterable/active_record_enumerator.rb  |  53 ++++
 .../sidekiq/job/iterable/csv_enumerator.rb    |  47 +++
 .../lib/sidekiq/job/iterable/enumerators.rb   | 135 +++++++++
 .../lib/sidekiq/job_logger.rb                 |  33 ++-
 .../lib/sidekiq/job_retry.rb                  |   7 +-
 .../lib/sidekiq/job_util.rb                   |   2 +
 .../lib/sidekiq/launcher.rb                   |   0
 .../lib/sidekiq/logger.rb                     |   0
 .../lib/sidekiq/manager.rb                    |   0
 .../lib/sidekiq/metrics/query.rb              |   2 +
 .../lib/sidekiq/metrics/shared.rb             |   2 +
 .../lib/sidekiq/metrics/tracking.rb           |  18 +-
 .../lib/sidekiq/middleware/chain.rb           |   0
 .../sidekiq/middleware/current_attributes.rb  |  40 ++-
 .../lib/sidekiq/middleware/i18n.rb            |   0
 .../lib/sidekiq/middleware/modules.rb         |   2 +
 .../lib/sidekiq/monitor.rb                    |   3 +-
 .../lib/sidekiq/paginator.rb                  |   0
 .../lib/sidekiq/processor.rb                  |  12 +-
 .../lib/sidekiq/rails.rb                      |   0
 .../lib/sidekiq/redis_client_adapter.rb       |  13 +-
 .../lib/sidekiq/redis_connection.rb           |  35 ++-
 .../lib/sidekiq/ring_buffer.rb                |   2 +
 .../lib/sidekiq/scheduled.rb                  |   0
 .../lib/sidekiq/sd_notify.rb                  |   0
 .../lib/sidekiq/systemd.rb                    |   2 +
 .../lib/sidekiq/testing.rb                    |   0
 .../lib/sidekiq/testing/inline.rb             |   0
 .../lib/sidekiq/transaction_aware_client.rb   |   0
 .../lib/sidekiq/version.rb                    |   2 +-
 .../lib/sidekiq/web.rb                        |  49 +++-
 .../lib/sidekiq/web/action.rb                 |   3 +-
 .../lib/sidekiq/web/application.rb            |  13 +-
 .../lib/sidekiq/web/csrf_protection.rb        |   0
 .../lib/sidekiq/web/helpers.rb                |  60 +++-
 .../lib/sidekiq/web/router.rb                 |   0
 .../lib/sidekiq/worker_compatibility_alias.rb |   0
 ...nge-calls-to-be-Redis-6.0-compatible.patch | 103 +++++++
 ...-Sidekiq-gemspec-to-avoid-use-of-git.patch | 155 ++++++++++
 vendor/gems/sidekiq/scripts/update-sidekiq.sh |  47 +++
 .../sidekiq.gemspec                           |   3 +-
 .../test/actors_test.rb                       |   0
 .../test/api_test.rb                          |   0
 .../test/capsule_test.rb                      |   0
 .../test/cfg/config__FILE__and__dir__.yml     |   0
 .../test/cfg/config_capsules.yml              |   0
 .../test/cfg/config_empty.yml                 |   0
 .../test/cfg/config_environment.yml           |   0
 .../cfg/config_queues_without_weights.yml     |   0
 .../test/cfg/config_string.yml                |   0
 .../test/cfg/config_with_alias.yml            |   0
 .../test/cfg/config_with_internal_options.yml |   0
 .../test/cli_test.rb                          |   0
 .../test/client_test.rb                       |  50 ++++
 .../test/config.yml                           |   0
 .../test/config_test.rb                       |   0
 .../test/csrf_test.rb                         |   0
 .../test/current_attributes_test.rb           |  28 ++
 .../test/dead_set_test.rb                     |   0
 .../test/dummy/config/application.rb          |   0
 .../test/dummy/config/database.yml            |   0
 .../test/dummy/config/environment.rb          |   2 +
 .../test/dummy/config/sidekiq.yml             |   0
 .../test/dummy/tmp/.keep                      |   0
 .../test/dummy/tmp/development_secret.txt     |   0
 .../test/dummy/tmp/local_secret.txt           |   0
 .../test/exception_handler_test.rb            |   0
 .../test/fake_env.rb                          |   0
 .../test/fetch_test.rb                        |   0
 .../test/filtering_test.rb                    |   2 +
 .../test/fixtures/en.yml                      |   0
 .../gems/sidekiq/test/fixtures/products.csv   |  12 +
 .../{sidekiq-7.2.4 => sidekiq}/test/helper.rb |  11 +-
 .../iterable/active_record_enumerator_test.rb | 138 +++++++++
 .../test/iterable/csv_enumerator_test.rb      | 102 +++++++
 .../sidekiq/test/iterable/iterable_jobs.rb    | 162 +++++++++++
 .../sidekiq/test/iterable/iterable_test.rb    | 267 ++++++++++++++++++
 .../test/job_generator_test.rb                |   0
 .../test/job_logger_test.rb                   |  24 +-
 .../test/job_test.rb                          |  37 +++
 .../test/launcher_test.rb                     |   0
 .../test/logger_test.rb                       |   0
 .../test/manager_test.rb                      |   0
 .../test/metrics_test.rb                      |  21 +-
 .../test/middleware_test.rb                   |   0
 .../test/processor_test.rb                    |  39 ++-
 .../test/rails_test.rb                        |   5 +-
 .../test/redis_connection_test.rb             |  37 ++-
 .../test/retry_exhausted_test.rb              |   2 +
 .../test/retry_test.rb                        |   2 +-
 .../test/scheduled_test.rb                    |   2 +-
 .../test/scheduling_test.rb                   |   0
 .../test/sharding_test.rb                     |   2 +
 .../test/sidekiq_test.rb                      |   0
 .../test/sidekiqmon_test.rb                   |   0
 .../test/systemd_test.rb                      |   0
 .../test/testing_fake_test.rb                 |   0
 .../test/testing_inline_test.rb               |   0
 .../test/testing_test.rb                      |   0
 .../test/transaction_aware_client_test.rb     |  20 +-
 .../test/web_helpers_test.rb                  |  28 +-
 .../test/web_test.rb                          |  38 ++-
 .../tmp/app/sidekiq/foo_job.rb                |   0
 .../web/assets/images/apple-touch-icon.png    | Bin
 .../web/assets/images/favicon.ico             | Bin
 .../web/assets/images/logo.png                | Bin
 .../web/assets/images/status.png              | Bin
 .../web/assets/javascripts/application.js     |   7 +-
 .../web/assets/javascripts/base-charts.js     |   0
 .../web/assets/javascripts/chart.min.js       |   0
 .../chartjs-plugin-annotation.min.js          |   0
 .../assets/javascripts/dashboard-charts.js    |  34 ++-
 .../web/assets/javascripts/dashboard.js       |   2 +-
 .../web/assets/javascripts/metrics.js         |   0
 .../assets/stylesheets/application-dark.css   |   0
 .../assets/stylesheets/application-rtl.css    |   0
 .../web/assets/stylesheets/application.css    |  14 +-
 .../assets/stylesheets/bootstrap-rtl.min.css  |   0
 .../web/assets/stylesheets/bootstrap.css      |   0
 .../web/locales/ar.yml                        |   0
 .../web/locales/cs.yml                        |   0
 .../web/locales/da.yml                        |   0
 .../web/locales/de.yml                        |   0
 .../web/locales/el.yml                        |   0
 .../web/locales/en.yml                        |   0
 .../web/locales/es.yml                        |   0
 .../web/locales/fa.yml                        |   0
 .../web/locales/fr.yml                        |   0
 .../web/locales/gd.yml                        |   0
 .../web/locales/he.yml                        |   0
 .../web/locales/hi.yml                        |   0
 .../web/locales/it.yml                        |   0
 .../web/locales/ja.yml                        |   0
 .../web/locales/ko.yml                        |   0
 .../web/locales/lt.yml                        |   0
 .../web/locales/nb.yml                        |   0
 .../web/locales/nl.yml                        |   0
 .../web/locales/pl.yml                        |   0
 .../web/locales/pt-br.yml                     |   0
 .../web/locales/pt.yml                        |   0
 .../web/locales/ru.yml                        |   0
 .../web/locales/sv.yml                        |   0
 .../web/locales/ta.yml                        |   0
 vendor/gems/sidekiq/web/locales/tr.yml        | 101 +++++++
 .../web/locales/uk.yml                        |   0
 .../web/locales/ur.yml                        |   0
 .../web/locales/vi.yml                        |   0
 .../web/locales/zh-cn.yml                     |   0
 .../web/locales/zh-tw.yml                     |   0
 .../web/views/_footer.erb                     |   0
 .../web/views/_job_info.erb                   |   0
 .../web/views/_metrics_period_select.erb      |   0
 .../web/views/_nav.erb                        |   0
 .../web/views/_paging.erb                     |   0
 .../web/views/_poll_link.erb                  |   0
 .../web/views/_status.erb                     |   0
 .../web/views/_summary.erb                    |   0
 .../web/views/busy.erb                        |   0
 .../web/views/dashboard.erb                   |  12 +-
 .../web/views/dead.erb                        |   0
 .../web/views/filtering.erb                   |   0
 .../web/views/layout.erb                      |  12 +-
 .../web/views/metrics.erb                     |   8 +-
 .../web/views/metrics_for_job.erb             |   8 +-
 .../web/views/morgue.erb                      |   0
 .../web/views/queue.erb                       |   0
 .../web/views/queues.erb                      |   0
 .../web/views/retries.erb                     |   0
 .../web/views/retry.erb                       |   0
 .../web/views/scheduled.erb                   |   0
 .../web/views/scheduled_job_info.erb          |   0
 242 files changed, 2670 insertions(+), 377 deletions(-)
 create mode 100644 db/migrate/20240821154407_add_project_id_column_to_ci_finished_build_ch_sync_event.rb
 create mode 100644 db/post_migrate/20240819102932_remove_projects_dast_site_profiles_project_id_fk.rb
 create mode 100644 db/post_migrate/20240826155650_add_index_for_ci_finished_build_ch_sync_event_on_project_id.rb
 create mode 100644 db/schema_migrations/20240819102932
 create mode 100644 db/schema_migrations/20240821154407
 create mode 100644 db/schema_migrations/20240826155650
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/.gitlab-ci.yml (92%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/Changes.md (97%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/Gemfile (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/Gemfile.lock (98%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/LICENSE.txt (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/NOTICE.txt (77%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/README.md (98%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/Rakefile (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/bin/multi_queue_bench (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/bin/sidekiq (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/bin/sidekiqload (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/bin/sidekiqmon (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/lib/generators/sidekiq/job_generator.rb (97%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/lib/generators/sidekiq/templates/job.rb.erb (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/lib/generators/sidekiq/templates/job_spec.rb.erb (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/lib/generators/sidekiq/templates/job_test.rb.erb (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/lib/sidekiq.rb (98%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/lib/sidekiq/api.rb (98%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/lib/sidekiq/capsule.rb (96%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/lib/sidekiq/cli.rb (99%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/lib/sidekiq/client.rb (98%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/lib/sidekiq/component.rb (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/lib/sidekiq/config.rb (98%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/lib/sidekiq/deploy.rb (98%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/lib/sidekiq/embedded.rb (98%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/lib/sidekiq/fetch.rb (95%)
 create mode 100644 vendor/gems/sidekiq/lib/sidekiq/iterable_job.rb
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/lib/sidekiq/job.rb (96%)
 create mode 100644 vendor/gems/sidekiq/lib/sidekiq/job/interrupt_handler.rb
 create mode 100644 vendor/gems/sidekiq/lib/sidekiq/job/iterable.rb
 create mode 100644 vendor/gems/sidekiq/lib/sidekiq/job/iterable/active_record_enumerator.rb
 create mode 100644 vendor/gems/sidekiq/lib/sidekiq/job/iterable/csv_enumerator.rb
 create mode 100644 vendor/gems/sidekiq/lib/sidekiq/job/iterable/enumerators.rb
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/lib/sidekiq/job_logger.rb (58%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/lib/sidekiq/job_retry.rb (97%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/lib/sidekiq/job_util.rb (99%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/lib/sidekiq/launcher.rb (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/lib/sidekiq/logger.rb (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/lib/sidekiq/manager.rb (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/lib/sidekiq/metrics/query.rb (99%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/lib/sidekiq/metrics/shared.rb (99%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/lib/sidekiq/metrics/tracking.rb (90%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/lib/sidekiq/middleware/chain.rb (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/lib/sidekiq/middleware/current_attributes.rb (74%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/lib/sidekiq/middleware/i18n.rb (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/lib/sidekiq/middleware/modules.rb (92%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/lib/sidekiq/monitor.rb (98%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/lib/sidekiq/paginator.rb (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/lib/sidekiq/processor.rb (96%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/lib/sidekiq/rails.rb (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/lib/sidekiq/redis_client_adapter.rb (88%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/lib/sidekiq/redis_connection.rb (67%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/lib/sidekiq/ring_buffer.rb (93%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/lib/sidekiq/scheduled.rb (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/lib/sidekiq/sd_notify.rb (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/lib/sidekiq/systemd.rb (96%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/lib/sidekiq/testing.rb (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/lib/sidekiq/testing/inline.rb (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/lib/sidekiq/transaction_aware_client.rb (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/lib/sidekiq/version.rb (75%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/lib/sidekiq/web.rb (61%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/lib/sidekiq/web/action.rb (94%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/lib/sidekiq/web/application.rb (96%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/lib/sidekiq/web/csrf_protection.rb (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/lib/sidekiq/web/helpers.rb (86%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/lib/sidekiq/web/router.rb (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/lib/sidekiq/worker_compatibility_alias.rb (100%)
 create mode 100644 vendor/gems/sidekiq/patches/0001-Update-zrange-calls-to-be-Redis-6.0-compatible.patch
 create mode 100644 vendor/gems/sidekiq/patches/0002-Update-Sidekiq-gemspec-to-avoid-use-of-git.patch
 create mode 100755 vendor/gems/sidekiq/scripts/update-sidekiq.sh
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/sidekiq.gemspec (98%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/test/actors_test.rb (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/test/api_test.rb (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/test/capsule_test.rb (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/test/cfg/config__FILE__and__dir__.yml (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/test/cfg/config_capsules.yml (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/test/cfg/config_empty.yml (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/test/cfg/config_environment.yml (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/test/cfg/config_queues_without_weights.yml (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/test/cfg/config_string.yml (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/test/cfg/config_with_alias.yml (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/test/cfg/config_with_internal_options.yml (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/test/cli_test.rb (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/test/client_test.rb (91%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/test/config.yml (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/test/config_test.rb (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/test/csrf_test.rb (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/test/current_attributes_test.rb (81%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/test/dead_set_test.rb (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/test/dummy/config/application.rb (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/test/dummy/config/database.yml (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/test/dummy/config/environment.rb (66%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/test/dummy/config/sidekiq.yml (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/test/dummy/tmp/.keep (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/test/dummy/tmp/development_secret.txt (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/test/dummy/tmp/local_secret.txt (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/test/exception_handler_test.rb (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/test/fake_env.rb (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/test/fetch_test.rb (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/test/filtering_test.rb (97%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/test/fixtures/en.yml (100%)
 create mode 100644 vendor/gems/sidekiq/test/fixtures/products.csv
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/test/helper.rb (81%)
 create mode 100644 vendor/gems/sidekiq/test/iterable/active_record_enumerator_test.rb
 create mode 100644 vendor/gems/sidekiq/test/iterable/csv_enumerator_test.rb
 create mode 100644 vendor/gems/sidekiq/test/iterable/iterable_jobs.rb
 create mode 100644 vendor/gems/sidekiq/test/iterable/iterable_test.rb
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/test/job_generator_test.rb (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/test/job_logger_test.rb (81%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/test/job_test.rb (85%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/test/launcher_test.rb (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/test/logger_test.rb (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/test/manager_test.rb (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/test/metrics_test.rb (89%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/test/middleware_test.rb (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/test/processor_test.rb (94%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/test/rails_test.rb (88%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/test/redis_connection_test.rb (84%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/test/retry_exhausted_test.rb (99%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/test/retry_test.rb (99%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/test/scheduled_test.rb (98%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/test/scheduling_test.rb (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/test/sharding_test.rb (97%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/test/sidekiq_test.rb (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/test/sidekiqmon_test.rb (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/test/systemd_test.rb (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/test/testing_fake_test.rb (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/test/testing_inline_test.rb (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/test/testing_test.rb (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/test/transaction_aware_client_test.rb (94%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/test/web_helpers_test.rb (90%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/test/web_test.rb (95%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/tmp/app/sidekiq/foo_job.rb (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/web/assets/images/apple-touch-icon.png (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/web/assets/images/favicon.ico (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/web/assets/images/logo.png (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/web/assets/images/status.png (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/web/assets/javascripts/application.js (99%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/web/assets/javascripts/base-charts.js (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/web/assets/javascripts/chart.min.js (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/web/assets/javascripts/chartjs-plugin-annotation.min.js (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/web/assets/javascripts/dashboard-charts.js (86%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/web/assets/javascripts/dashboard.js (98%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/web/assets/javascripts/metrics.js (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/web/assets/stylesheets/application-dark.css (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/web/assets/stylesheets/application-rtl.css (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/web/assets/stylesheets/application.css (99%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/web/assets/stylesheets/bootstrap-rtl.min.css (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/web/assets/stylesheets/bootstrap.css (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/web/locales/ar.yml (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/web/locales/cs.yml (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/web/locales/da.yml (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/web/locales/de.yml (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/web/locales/el.yml (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/web/locales/en.yml (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/web/locales/es.yml (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/web/locales/fa.yml (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/web/locales/fr.yml (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/web/locales/gd.yml (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/web/locales/he.yml (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/web/locales/hi.yml (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/web/locales/it.yml (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/web/locales/ja.yml (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/web/locales/ko.yml (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/web/locales/lt.yml (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/web/locales/nb.yml (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/web/locales/nl.yml (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/web/locales/pl.yml (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/web/locales/pt-br.yml (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/web/locales/pt.yml (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/web/locales/ru.yml (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/web/locales/sv.yml (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/web/locales/ta.yml (100%)
 create mode 100644 vendor/gems/sidekiq/web/locales/tr.yml
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/web/locales/uk.yml (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/web/locales/ur.yml (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/web/locales/vi.yml (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/web/locales/zh-cn.yml (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/web/locales/zh-tw.yml (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/web/views/_footer.erb (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/web/views/_job_info.erb (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/web/views/_metrics_period_select.erb (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/web/views/_nav.erb (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/web/views/_paging.erb (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/web/views/_poll_link.erb (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/web/views/_status.erb (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/web/views/_summary.erb (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/web/views/busy.erb (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/web/views/dashboard.erb (91%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/web/views/dead.erb (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/web/views/filtering.erb (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/web/views/layout.erb (77%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/web/views/metrics.erb (94%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/web/views/metrics_for_job.erb (90%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/web/views/morgue.erb (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/web/views/queue.erb (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/web/views/queues.erb (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/web/views/retries.erb (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/web/views/retry.erb (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/web/views/scheduled.erb (100%)
 rename vendor/gems/{sidekiq-7.2.4 => sidekiq}/web/views/scheduled_job_info.erb (100%)

diff --git a/.gitlab/ci/vendored-gems.gitlab-ci.yml b/.gitlab/ci/vendored-gems.gitlab-ci.yml
index c0e0f91f0f5..0f0604ad194 100644
--- a/.gitlab/ci/vendored-gems.gitlab-ci.yml
+++ b/.gitlab/ci/vendored-gems.gitlab-ci.yml
@@ -53,5 +53,5 @@ include:
       gem_path_prefix: "vendor/gems/"
   - local: .gitlab/ci/templates/gem.gitlab-ci.yml
     inputs:
-      gem_name: "sidekiq-7.2.4"
+      gem_name: "sidekiq"
       gem_path_prefix: "vendor/gems/"
diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION
index 77ede3091ae..7bef17d71d2 100644
--- a/GITALY_SERVER_VERSION
+++ b/GITALY_SERVER_VERSION
@@ -1 +1 @@
-3d13cb66eadf8a4659adf0e19d362a78e0edc764
+89509d2a8ff4213622ca9c6c19de75f2307a594c
diff --git a/Gemfile b/Gemfile
index e428c50a081..bc19107282e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -279,7 +279,7 @@ end
 gem 'state_machines-activerecord', '~> 0.8.0' # rubocop:todo Gemfile/MissingFeatureCategory
 
 # Background jobs
-gem 'sidekiq', path: 'vendor/gems/sidekiq-7.2.4', require: 'sidekiq', feature_category: :scalability
+gem 'sidekiq', path: 'vendor/gems/sidekiq', require: 'sidekiq', feature_category: :scalability
 gem 'sidekiq-cron', '~> 1.12.0', feature_category: :scalability
 gem 'gitlab-sidekiq-fetcher',
   path: 'vendor/gems/sidekiq-reliable-fetch',
diff --git a/Gemfile.checksum b/Gemfile.checksum
index de67b731136..6923352bfde 100644
--- a/Gemfile.checksum
+++ b/Gemfile.checksum
@@ -604,7 +604,7 @@
 {"name":"rubocop-rails","version":"2.24.1","platform":"ruby","checksum":"03edf766954947468f3686cedb69142fae4f10e2007287f89cc0ea7072eeac19"},
 {"name":"rubocop-rspec","version":"2.27.1","platform":"ruby","checksum":"2f27ce04700be75db65afe83d7993a36e0fafd07ec062222f4b3cc10137a7a9e"},
 {"name":"ruby-fogbugz","version":"0.3.0","platform":"ruby","checksum":"5e04cde474648f498a71cf1e1a7ab42c66b953862fbe224f793ec0a7a1d5f657"},
-{"name":"ruby-lsp","version":"0.17.14","platform":"ruby","checksum":"02ee435f03aaf3f858dc1c1f8a001fbb85887a3291534c054e556340712fb1c9"},
+{"name":"ruby-lsp","version":"0.17.15","platform":"ruby","checksum":"c7c6f1dc793713bfefe2ed818ac3a5e4aae4a44c03978f7cc526b8c5002b7e57"},
 {"name":"ruby-lsp-rails","version":"0.3.13","platform":"ruby","checksum":"689bf2d0961cb73192d3c65c589000b9ed99275cf4abb5fe2c5243e0e42fe7fa"},
 {"name":"ruby-lsp-rspec","version":"0.1.12","platform":"ruby","checksum":"34fe775e27dc4c2f31df901f3d44ee885ed0806b05ba9be0ea564682dd4811e5"},
 {"name":"ruby-magic","version":"0.6.0","platform":"ruby","checksum":"7b2138877b7d23aff812c95564eba6473b74b815ef85beb0eb792e729a2b6101"},
diff --git a/Gemfile.lock b/Gemfile.lock
index 0286f892be2..01fdafafd1d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -193,15 +193,6 @@ PATH
       nokogiri (>= 1.4.4)
       omniauth (~> 2.0)
 
-PATH
-  remote: vendor/gems/sidekiq-7.2.4
-  specs:
-    sidekiq (7.2.4)
-      concurrent-ruby (< 2)
-      connection_pool (>= 2.3.0)
-      rack (>= 2.2.4)
-      redis-client (>= 0.19.0)
-
 PATH
   remote: vendor/gems/sidekiq-reliable-fetch
   specs:
@@ -209,6 +200,16 @@ PATH
       json (>= 2.5)
       sidekiq (~> 7.0)
 
+PATH
+  remote: vendor/gems/sidekiq
+  specs:
+    sidekiq (7.3.1)
+      concurrent-ruby (< 2)
+      connection_pool (>= 2.3.0)
+      logger
+      rack (>= 2.2.4)
+      redis-client (>= 0.22.2)
+
 GEM
   remote: https://rubygems.org/
   specs:
@@ -1644,7 +1645,7 @@ GEM
     ruby-fogbugz (0.3.0)
       crack (~> 0.4)
       multipart-post (~> 2.0)
-    ruby-lsp (0.17.14)
+    ruby-lsp (0.17.15)
       language_server-protocol (~> 3.17.0)
       prism (>= 0.29.0, < 0.31)
       rbs (>= 3, < 4)
diff --git a/Gemfile.next.lock b/Gemfile.next.lock
index 2d6dafccf85..83771a629f7 100644
--- a/Gemfile.next.lock
+++ b/Gemfile.next.lock
@@ -193,15 +193,6 @@ PATH
       nokogiri (>= 1.4.4)
       omniauth (~> 2.0)
 
-PATH
-  remote: vendor/gems/sidekiq-7.2.4
-  specs:
-    sidekiq (7.2.4)
-      concurrent-ruby (< 2)
-      connection_pool (>= 2.3.0)
-      rack (>= 2.2.4)
-      redis-client (>= 0.19.0)
-
 PATH
   remote: vendor/gems/sidekiq-reliable-fetch
   specs:
@@ -209,6 +200,16 @@ PATH
       json (>= 2.5)
       sidekiq (~> 7.0)
 
+PATH
+  remote: vendor/gems/sidekiq
+  specs:
+    sidekiq (7.3.1)
+      concurrent-ruby (< 2)
+      connection_pool (>= 2.3.0)
+      logger
+      rack (>= 2.2.4)
+      redis-client (>= 0.22.2)
+
 GEM
   remote: https://rubygems.org/
   specs:
diff --git a/app/assets/javascripts/graphql_shared/possible_types.json b/app/assets/javascripts/graphql_shared/possible_types.json
index 78fa110efad..13ff3f0f9c9 100644
--- a/app/assets/javascripts/graphql_shared/possible_types.json
+++ b/app/assets/javascripts/graphql_shared/possible_types.json
@@ -186,6 +186,7 @@
     "VulnerabilityDetailBase",
     "VulnerabilityDetailBoolean",
     "VulnerabilityDetailCode",
+    "VulnerabilityDetailCodeFlows",
     "VulnerabilityDetailCommit",
     "VulnerabilityDetailDiff",
     "VulnerabilityDetailFileLocation",
diff --git a/app/assets/javascripts/issues/show/components/app.vue b/app/assets/javascripts/issues/show/components/app.vue
index 25262fbfe1a..786a31971cd 100644
--- a/app/assets/javascripts/issues/show/components/app.vue
+++ b/app/assets/javascripts/issues/show/components/app.vue
@@ -560,10 +560,13 @@ export default {
         :is-hidden="isHidden"
         :is-imported="isImported"
         :is-locked="isLocked"
-        :issuable-status="issuableStatus"
+        :issuable-state="issuableStatus"
         :issuable-type="issuableType"
         :show="isStickyHeaderShowing"
         :title="state.titleText"
+        :duplicated-to-issue-url="duplicatedToIssueUrl"
+        :moved-to-issue-url="movedToIssueUrl"
+        :promoted-to-epic-url="promotedToEpicUrl"
         @hide="hideStickyHeader"
         @show="showStickyHeader"
       />
diff --git a/app/assets/javascripts/issues/show/components/sticky_header.vue b/app/assets/javascripts/issues/show/components/sticky_header.vue
index f8f6062054f..6daa4d4492b 100644
--- a/app/assets/javascripts/issues/show/components/sticky_header.vue
+++ b/app/assets/javascripts/issues/show/components/sticky_header.vue
@@ -1,10 +1,11 @@
 <script>
-import { GlBadge, GlIntersectionObserver, GlLink } from '@gitlab/ui';
+import { GlBadge, GlIntersectionObserver, GlLink, GlSprintf } from '@gitlab/ui';
 import HiddenBadge from '~/issuable/components/hidden_badge.vue';
 import LockedBadge from '~/issuable/components/locked_badge.vue';
-import { issuableStatusText, STATUS_CLOSED, WORKSPACE_PROJECT } from '~/issues/constants';
+import { STATUS_OPEN, STATUS_REOPENED, STATUS_CLOSED, WORKSPACE_PROJECT } from '~/issues/constants';
 import ConfidentialityBadge from '~/vue_shared/components/confidentiality_badge.vue';
 import ImportedBadge from '~/vue_shared/components/imported_badge.vue';
+import { __, s__ } from '~/locale';
 
 export default {
   WORKSPACE_PROJECT,
@@ -13,6 +14,7 @@ export default {
     GlBadge,
     GlIntersectionObserver,
     GlLink,
+    GlSprintf,
     HiddenBadge,
     ImportedBadge,
     LockedBadge,
@@ -38,7 +40,7 @@ export default {
       required: false,
       default: false,
     },
-    issuableStatus: {
+    issuableState: {
       type: String,
       required: true,
     },
@@ -55,16 +57,52 @@ export default {
       type: String,
       required: true,
     },
+    duplicatedToIssueUrl: {
+      type: String,
+      required: true,
+    },
+    movedToIssueUrl: {
+      type: String,
+      required: true,
+    },
+    promotedToEpicUrl: {
+      type: String,
+      required: true,
+    },
   },
   computed: {
+    isOpen() {
+      return this.issuableState === STATUS_OPEN || this.issuableState === STATUS_REOPENED;
+    },
     isClosed() {
-      return this.issuableStatus === STATUS_CLOSED;
+      return this.issuableState === STATUS_CLOSED;
     },
     statusIcon() {
       return this.isClosed ? 'issue-close' : 'issue-open-m';
     },
     statusText() {
-      return issuableStatusText[this.issuableStatus];
+      if (this.isOpen) {
+        return __('Open');
+      }
+      if (this.closedStatusLink) {
+        return s__('IssuableStatus|Closed (%{link})');
+      }
+      return s__('IssuableStatus|Closed');
+    },
+    closedStatusLink() {
+      return this.duplicatedToIssueUrl || this.movedToIssueUrl || this.promotedToEpicUrl;
+    },
+    closedStatusText() {
+      if (this.duplicatedToIssueUrl) {
+        return s__('IssuableStatus|duplicated');
+      }
+      if (this.movedToIssueUrl) {
+        return s__('IssuableStatus|moved');
+      }
+      if (this.promotedToEpicUrl) {
+        return s__('IssuableStatus|promoted');
+      }
+      return '';
     },
     statusVariant() {
       return this.isClosed ? 'info' : 'success';
@@ -83,7 +121,17 @@ export default {
       >
         <div class="issue-sticky-header-text gl-mx-auto gl-flex gl-items-center gl-gap-2">
           <gl-badge :variant="statusVariant" :icon="statusIcon" class="gl-shrink-0">
-            {{ statusText }}
+            <gl-sprintf v-if="closedStatusLink" :message="statusText">
+              <template #link>
+                <gl-link
+                  data-testid="sticky-header-closed-status-link"
+                  class="!gl-text-inherit gl-underline"
+                  :href="closedStatusLink"
+                  >{{ closedStatusText }}</gl-link
+                >
+              </template>
+            </gl-sprintf>
+            <template v-else>{{ statusText }}</template>
           </gl-badge>
           <confidentiality-badge
             v-if="isConfidential"
diff --git a/app/assets/javascripts/repository/components/commit_info.vue b/app/assets/javascripts/repository/components/commit_info.vue
index 70967acf954..7f7f77fa300 100644
--- a/app/assets/javascripts/repository/components/commit_info.vue
+++ b/app/assets/javascripts/repository/components/commit_info.vue
@@ -109,7 +109,7 @@ export default {
           />
         </div>
         <div
-          class="committer gl-basis-full"
+          class="committer gl-basis-full gl-truncate gl-text-sm"
           :class="{ 'gl-inline-flex': truncateAuthorName }"
           data-testid="committer"
         >
diff --git a/app/models/ci/finished_pipeline_ch_sync_event.rb b/app/models/ci/finished_pipeline_ch_sync_event.rb
index ef9f03aee59..3187da45d6d 100644
--- a/app/models/ci/finished_pipeline_ch_sync_event.rb
+++ b/app/models/ci/finished_pipeline_ch_sync_event.rb
@@ -16,7 +16,7 @@ module Ci
     ignore_columns :partition, remove_never: true
 
     partitioned_by :partition, strategy: :sliding_list,
-      next_partition_if: ->(active_partition) { any_older_exist?(active_partition, PARTITION_DURATION) },
+      next_partition_if: ->(active_partition) { any_older_partitions_exist?(active_partition, PARTITION_DURATION) },
       detach_partition_if: ->(partition) { detach_partition?(partition) }
 
     validates :pipeline_id, presence: true
@@ -48,18 +48,18 @@ module Ci
       return true unless pending.for_partition(partition.value).exists?
 
       # or if there are pending events, they are outside the cleanup threshold
-      return true unless any_newer_exist?(partition, PARTITION_CLEANUP_THRESHOLD)
+      return true unless any_newer_partitions_exist?(partition, PARTITION_CLEANUP_THRESHOLD)
 
       false
     end
 
-    def self.any_older_exist?(partition, duration)
+    def self.any_older_partitions_exist?(partition, duration)
       for_partition(partition.value)
         .where(arel_table[:pipeline_finished_at].lteq(duration.ago))
         .exists?
     end
 
-    def self.any_newer_exist?(partition, duration)
+    def self.any_newer_partitions_exist?(partition, duration)
       for_partition(partition.value)
         .where(arel_table[:pipeline_finished_at].gt(duration.ago))
         .exists?
diff --git a/app/models/user_preference.rb b/app/models/user_preference.rb
index ce438fd8a54..39452e01933 100644
--- a/app/models/user_preference.rb
+++ b/app/models/user_preference.rb
@@ -79,19 +79,6 @@ class UserPreference < ApplicationRecord
     self[notes_filter_field_for(resource)]
   end
 
-  def tab_width
-    read_attribute(:tab_width) || self.class.column_defaults['tab_width']
-  end
-
-  def tab_width=(value)
-    if value.nil?
-      default = self.class.column_defaults['tab_width']
-      super(default)
-    else
-      super(value)
-    end
-  end
-
   class << self
     def time_display_formats
       {
@@ -102,38 +89,6 @@ class UserPreference < ApplicationRecord
     end
   end
 
-  def time_display_relative
-    value = read_attribute(:time_display_relative)
-    return value unless value.nil?
-
-    self.class.column_defaults['time_display_relative']
-  end
-
-  def time_display_relative=(value)
-    if value.nil?
-      default = self.class.column_defaults['time_display_relative']
-      super(default)
-    else
-      super(value)
-    end
-  end
-
-  def render_whitespace_in_code
-    value = read_attribute(:render_whitespace_in_code)
-    return value unless value.nil?
-
-    self.class.column_defaults['render_whitespace_in_code']
-  end
-
-  def render_whitespace_in_code=(value)
-    if value.nil?
-      default = self.class.column_defaults['render_whitespace_in_code']
-      super(default)
-    else
-      super(value)
-    end
-  end
-
   def early_access_event_tracking?
     early_access_program_participant? && early_access_program_tracking?
   end
diff --git a/app/models/virtual_registries/packages/maven/registry.rb b/app/models/virtual_registries/packages/maven/registry.rb
index fdd2d9d722a..a7dbfdf0746 100644
--- a/app/models/virtual_registries/packages/maven/registry.rb
+++ b/app/models/virtual_registries/packages/maven/registry.rb
@@ -14,6 +14,16 @@ module VirtualRegistries
         validates :cache_validity_hours, numericality: { greater_than_or_equal_to: 0, only_integer: true }
 
         scope :for_group, ->(group) { where(group: group) }
+
+        before_destroy :destroy_upstream
+
+        private
+
+        # TODO: revisit this when we support multiple upstreams.
+        # https://gitlab.com/gitlab-org/gitlab/-/issues/480461
+        def destroy_upstream
+          upstream&.destroy!
+        end
       end
     end
   end
diff --git a/app/views/projects/blame/_page.html.haml b/app/views/projects/blame/_page.html.haml
index 10f27c3f620..0754b742fb8 100644
--- a/app/views/projects/blame/_page.html.haml
+++ b/app/views/projects/blame/_page.html.haml
@@ -15,7 +15,7 @@
             = commit_data.commit_link
           = commit_data.project_blame_link
 
-        .light
+        .gl-text-sm.gl-text-subtle
           = commit_data.commit_author_link
           = _('committed')
           #{commit_data.time_ago_tooltip}
diff --git a/config/gitlab_loose_foreign_keys.yml b/config/gitlab_loose_foreign_keys.yml
index 147c0572ac9..89d68140876 100644
--- a/config/gitlab_loose_foreign_keys.yml
+++ b/config/gitlab_loose_foreign_keys.yml
@@ -208,6 +208,10 @@ dast_scanner_profiles_builds:
   - table: p_ci_builds
     column: ci_build_id
     on_delete: async_delete
+dast_site_profiles:
+  - table: projects
+    column: project_id
+    on_delete: async_delete
 dast_site_profiles_builds:
   - table: ci_builds
     column: ci_build_id
@@ -338,6 +342,10 @@ p_ci_builds_metadata:
   - table: projects
     column: project_id
     on_delete: async_delete
+p_ci_finished_build_ch_sync_events:
+  - table: projects
+    column: project_id
+    on_delete: async_delete
 p_ci_finished_pipeline_ch_sync_events:
   - table: namespaces
     column: project_namespace_id
diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb
index c156d54e41f..86a298fe3f8 100644
--- a/config/initializers/sidekiq.rb
+++ b/config/initializers/sidekiq.rb
@@ -38,7 +38,7 @@ strict_args_mode = Gitlab.dev_or_test_env? ? :warn : false
 Sidekiq.strict_args!(strict_args_mode)
 
 # Perform version check before configuring server with the custome scheduled job enqueue class
-unless Gem::Version.new(Sidekiq::VERSION) == Gem::Version.new('7.2.4')
+unless Gem::Version.new(Sidekiq::VERSION) == Gem::Version.new('7.3.1')
   raise 'New version of Sidekiq detected, please either update the version for this check ' \
         'and update Gitlab::SidekiqSharding::ScheduledEnq is compatible.'
 end
diff --git a/db/docs/dast_site_profiles.yml b/db/docs/dast_site_profiles.yml
index f35cc2e2b5c..7a1a4b3c416 100644
--- a/db/docs/dast_site_profiles.yml
+++ b/db/docs/dast_site_profiles.yml
@@ -7,7 +7,7 @@ feature_categories:
 description: A site profile describes the attributes of a web site to scan on demand with DAST
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/36659
 milestone: '13.2'
-gitlab_schema: gitlab_main_cell
+gitlab_schema: gitlab_sec
 allow_cross_foreign_keys:
 - gitlab_main_clusterwide
 sharding_key:
diff --git a/db/docs/p_ci_finished_build_ch_sync_events.yml b/db/docs/p_ci_finished_build_ch_sync_events.yml
index ff74683afcc..66fcb6f17f1 100644
--- a/db/docs/p_ci_finished_build_ch_sync_events.yml
+++ b/db/docs/p_ci_finished_build_ch_sync_events.yml
@@ -8,4 +8,5 @@ description: Holds references to finished CI builds ready to be synced to ClickH
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/131902
 milestone: '16.5'
 gitlab_schema: gitlab_ci
-sharding_key_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/459997
+sharding_key:
+  project_id: projects
diff --git a/db/docs/security_findings.yml b/db/docs/security_findings.yml
index 01c8f9c1745..ccf6092ca2b 100644
--- a/db/docs/security_findings.yml
+++ b/db/docs/security_findings.yml
@@ -10,4 +10,12 @@ milestone: '13.4'
 gitlab_schema: gitlab_sec
 allow_cross_foreign_keys:
 - gitlab_main_clusterwide
-sharding_key_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/454949
+desired_sharding_key:
+  project_id:
+    references: projects
+    backfill_via:
+      parent:
+        foreign_key: scanner_id
+        table: vulnerability_scanners
+        sharding_key: project_id
+        belongs_to: scanner
diff --git a/db/migrate/20240821154407_add_project_id_column_to_ci_finished_build_ch_sync_event.rb b/db/migrate/20240821154407_add_project_id_column_to_ci_finished_build_ch_sync_event.rb
new file mode 100644
index 00000000000..05799c0710b
--- /dev/null
+++ b/db/migrate/20240821154407_add_project_id_column_to_ci_finished_build_ch_sync_event.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class AddProjectIdColumnToCiFinishedBuildChSyncEvent < Gitlab::Database::Migration[2.2]
+  milestone '17.4'
+
+  def change
+    # Normally, we'd make this a nullable column, and over the course of multiple milestones, make it a
+    # non-nullable column with a constraint.
+    # We can save time knowing that the records in this table have a maximum lifetime of 30 days
+    #   (less in .com since the daily partition gets dropped after being processed by the worker).
+    # We'll start by adding -1 to all project_ids, knowing that this value is not used yet.
+    # Once all the rows have valid values, we can drop all the rows having a -1 project_id.
+    add_column :p_ci_finished_build_ch_sync_events, :project_id, :bigint, default: -1, null: false
+  end
+end
diff --git a/db/post_migrate/20240819102932_remove_projects_dast_site_profiles_project_id_fk.rb b/db/post_migrate/20240819102932_remove_projects_dast_site_profiles_project_id_fk.rb
new file mode 100644
index 00000000000..a6c01b05522
--- /dev/null
+++ b/db/post_migrate/20240819102932_remove_projects_dast_site_profiles_project_id_fk.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+class RemoveProjectsDastSiteProfilesProjectIdFk < Gitlab::Database::Migration[2.2]
+  milestone '17.3'
+  disable_ddl_transaction!
+
+  FOREIGN_KEY_NAME = "fk_rails_83e309d69e"
+
+  def up
+    with_lock_retries do
+      remove_foreign_key_if_exists(:dast_site_profiles, :projects,
+        name: FOREIGN_KEY_NAME, reverse_lock_order: true)
+    end
+  end
+
+  def down
+    add_concurrent_foreign_key(:dast_site_profiles, :projects,
+      name: FOREIGN_KEY_NAME, column: :project_id,
+      target_column: :id, on_delete: :cascade)
+  end
+end
diff --git a/db/post_migrate/20240826155650_add_index_for_ci_finished_build_ch_sync_event_on_project_id.rb b/db/post_migrate/20240826155650_add_index_for_ci_finished_build_ch_sync_event_on_project_id.rb
new file mode 100644
index 00000000000..aea325fb7de
--- /dev/null
+++ b/db/post_migrate/20240826155650_add_index_for_ci_finished_build_ch_sync_event_on_project_id.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+class AddIndexForCiFinishedBuildChSyncEventOnProjectId < Gitlab::Database::Migration[2.2]
+  include Gitlab::Database::PartitioningMigrationHelpers
+
+  disable_ddl_transaction!
+
+  milestone '17.4'
+
+  TABLE_NAME = :p_ci_finished_build_ch_sync_events
+  INDEX_NAME = :index_p_ci_finished_build_ch_sync_events_on_project_id
+  COLUMN = :project_id
+
+  def up
+    add_concurrent_partitioned_index(TABLE_NAME, COLUMN, name: INDEX_NAME)
+  end
+
+  def down
+    remove_concurrent_partitioned_index_by_name(TABLE_NAME, INDEX_NAME)
+  end
+end
diff --git a/db/schema_migrations/20240819102932 b/db/schema_migrations/20240819102932
new file mode 100644
index 00000000000..1f1acfe3aa1
--- /dev/null
+++ b/db/schema_migrations/20240819102932
@@ -0,0 +1 @@
+3ad9103f070e812b9ec7246e78f6fc440189565afbf7adb8f67f84e1fc20d388
\ No newline at end of file
diff --git a/db/schema_migrations/20240821154407 b/db/schema_migrations/20240821154407
new file mode 100644
index 00000000000..a8f82013b02
--- /dev/null
+++ b/db/schema_migrations/20240821154407
@@ -0,0 +1 @@
+197316872638bd735359f1adb3f8ef01d42162a48177ff22990cb7ebcd115a08
\ No newline at end of file
diff --git a/db/schema_migrations/20240826155650 b/db/schema_migrations/20240826155650
new file mode 100644
index 00000000000..6f3f475df51
--- /dev/null
+++ b/db/schema_migrations/20240826155650
@@ -0,0 +1 @@
+df86994deaac3114e5ab544bfd7f7725ce9f552af2f3a2d3729e2b888d82def6
\ No newline at end of file
diff --git a/db/structure.sql b/db/structure.sql
index 3a1074b9f68..384c074cfd8 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -2743,7 +2743,8 @@ CREATE TABLE p_ci_finished_build_ch_sync_events (
     build_id bigint NOT NULL,
     partition bigint DEFAULT 1 NOT NULL,
     build_finished_at timestamp without time zone NOT NULL,
-    processed boolean DEFAULT false NOT NULL
+    processed boolean DEFAULT false NOT NULL,
+    project_id bigint DEFAULT '-1'::integer NOT NULL
 )
 PARTITION BY LIST (partition);
 
@@ -29280,6 +29281,8 @@ CREATE INDEX index_p_ci_builds_execution_configs_on_project_id ON ONLY p_ci_buil
 
 CREATE INDEX index_p_ci_finished_build_ch_sync_events_finished_at ON ONLY p_ci_finished_build_ch_sync_events USING btree (partition, build_finished_at);
 
+CREATE INDEX index_p_ci_finished_build_ch_sync_events_on_project_id ON ONLY p_ci_finished_build_ch_sync_events USING btree (project_id);
+
 CREATE UNIQUE INDEX index_p_ci_job_annotations_on_partition_id_job_id_name ON ONLY p_ci_job_annotations USING btree (partition_id, job_id, name);
 
 CREATE INDEX index_p_ci_runner_machine_builds_on_runner_machine_id ON ONLY p_ci_runner_machine_builds USING btree (runner_machine_id);
@@ -35517,9 +35520,6 @@ ALTER TABLE ONLY cluster_enabled_grants
 ALTER TABLE ONLY virtual_registries_packages_maven_registry_upstreams
     ADD CONSTRAINT fk_rails_838d054752 FOREIGN KEY (group_id) REFERENCES namespaces(id) ON DELETE CASCADE;
 
-ALTER TABLE ONLY dast_site_profiles
-    ADD CONSTRAINT fk_rails_83e309d69e FOREIGN KEY (project_id) REFERENCES projects(id) ON DELETE CASCADE;
-
 ALTER TABLE ONLY dependency_list_export_parts
     ADD CONSTRAINT fk_rails_83f26c0e6f FOREIGN KEY (dependency_list_export_id) REFERENCES dependency_list_exports(id) ON DELETE CASCADE;
 
diff --git a/doc/api/graphql/reference/index.md b/doc/api/graphql/reference/index.md
index 99e3a29eaa2..42a7b668a68 100644
--- a/doc/api/graphql/reference/index.md
+++ b/doc/api/graphql/reference/index.md
@@ -33957,6 +33957,33 @@ Represents the vulnerability details code field.
 | <a id="vulnerabilitydetailcodename"></a>`name` | [`String`](#string) | Name of the field. |
 | <a id="vulnerabilitydetailcodevalue"></a>`value` | [`String!`](#string) | Source code. |
 
+### `VulnerabilityDetailCodeFlowNode`
+
+Represents the vulnerability details code flow node item.
+
+#### Fields
+
+| Name | Type | Description |
+| ---- | ---- | ----------- |
+| <a id="vulnerabilitydetailcodeflownodedescription"></a>`description` | [`String`](#string) | Description of the field. |
+| <a id="vulnerabilitydetailcodeflownodefieldname"></a>`fieldName` | [`String`](#string) | Name of the field. |
+| <a id="vulnerabilitydetailcodeflownodefilelocation"></a>`fileLocation` | [`VulnerabilityDetailFileLocation!`](#vulnerabilitydetailfilelocation) | Location of the file. |
+| <a id="vulnerabilitydetailcodeflownodename"></a>`name` | [`String`](#string) | Name of the field. |
+| <a id="vulnerabilitydetailcodeflownodenodetype"></a>`nodeType` | [`CodeFlowNodeType!`](#codeflownodetype) | Node Type. |
+
+### `VulnerabilityDetailCodeFlows`
+
+Represents the vulnerability details code flows item.
+
+#### Fields
+
+| Name | Type | Description |
+| ---- | ---- | ----------- |
+| <a id="vulnerabilitydetailcodeflowsdescription"></a>`description` | [`String`](#string) | Description of the field. |
+| <a id="vulnerabilitydetailcodeflowsfieldname"></a>`fieldName` | [`String`](#string) | Name of the field. |
+| <a id="vulnerabilitydetailcodeflowsitems"></a>`items` | [`[[VulnerabilityDetailCodeFlowNode!]!]!`](#vulnerabilitydetailcodeflownode) | List of flows represented by list of CodeFlowNodeItem. |
+| <a id="vulnerabilitydetailcodeflowsname"></a>`name` | [`String`](#string) | Name of the field. |
+
 ### `VulnerabilityDetailCommit`
 
 Represents the vulnerability details commit field.
@@ -35690,6 +35717,16 @@ Values for sorting variables.
 | <a id="civariabletypeenv_var"></a>`ENV_VAR` | Env var type. |
 | <a id="civariabletypefile"></a>`FILE` | File type. |
 
+### `CodeFlowNodeType`
+
+The code flow node type.
+
+| Value | Description |
+| ----- | ----------- |
+| <a id="codeflownodetypepropagation"></a>`PROPAGATION` | Propagation node. |
+| <a id="codeflownodetypesink"></a>`SINK` | Sink node. |
+| <a id="codeflownodetypesource"></a>`SOURCE` | Source node. |
+
 ### `CodeQualityDegradationSeverity`
 
 | Value | Description |
@@ -39648,6 +39685,7 @@ One of:
 - [`VulnerabilityDetailBase`](#vulnerabilitydetailbase)
 - [`VulnerabilityDetailBoolean`](#vulnerabilitydetailboolean)
 - [`VulnerabilityDetailCode`](#vulnerabilitydetailcode)
+- [`VulnerabilityDetailCodeFlows`](#vulnerabilitydetailcodeflows)
 - [`VulnerabilityDetailCommit`](#vulnerabilitydetailcommit)
 - [`VulnerabilityDetailDiff`](#vulnerabilitydetaildiff)
 - [`VulnerabilityDetailFileLocation`](#vulnerabilitydetailfilelocation)
diff --git a/lib/gitlab/patch/sidekiq_cron_poller.rb b/lib/gitlab/patch/sidekiq_cron_poller.rb
index a40ebae4789..27361fa27af 100644
--- a/lib/gitlab/patch/sidekiq_cron_poller.rb
+++ b/lib/gitlab/patch/sidekiq_cron_poller.rb
@@ -7,7 +7,7 @@
 require 'sidekiq/version'
 require 'sidekiq/cron/version'
 
-if Gem::Version.new(Sidekiq::VERSION) != Gem::Version.new('7.2.4')
+if Gem::Version.new(Sidekiq::VERSION) != Gem::Version.new('7.3.1')
   raise 'New version of sidekiq detected, please remove or update this patch'
 end
 
diff --git a/lib/gitlab/patch/sidekiq_job_setter.rb b/lib/gitlab/patch/sidekiq_job_setter.rb
index c16218c7cde..fd7e2c29b09 100644
--- a/lib/gitlab/patch/sidekiq_job_setter.rb
+++ b/lib/gitlab/patch/sidekiq_job_setter.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-if Gem::Version.new(Sidekiq::VERSION) != Gem::Version.new('7.2.4')
+if Gem::Version.new(Sidekiq::VERSION) != Gem::Version.new('7.3.1')
   raise 'New version of sidekiq detected, please remove or update this patch'
 end
 
diff --git a/spec/frontend/issues/show/components/sticky_header_spec.js b/spec/frontend/issues/show/components/sticky_header_spec.js
index e6244e3be10..cf7548910f9 100644
--- a/spec/frontend/issues/show/components/sticky_header_spec.js
+++ b/spec/frontend/issues/show/components/sticky_header_spec.js
@@ -1,4 +1,4 @@
-import { GlBadge, GlLink } from '@gitlab/ui';
+import { GlBadge, GlLink, GlSprintf } from '@gitlab/ui';
 import { shallowMountExtended } from 'helpers/vue_test_utils_helper';
 import HiddenBadge from '~/issuable/components/hidden_badge.vue';
 import LockedBadge from '~/issuable/components/locked_badge.vue';
@@ -23,21 +23,32 @@ describe('StickyHeader component', () => {
   const findImportedBadge = () => wrapper.findComponent(ImportedBadge);
   const findLockedBadge = () => wrapper.findComponent(LockedBadge);
   const findTitle = () => wrapper.findComponent(GlLink);
+  const findClosedStatusLink = () =>
+    wrapper.find('[data-testid="sticky-header-closed-status-link"');
+  const findIssuableHeader = () => wrapper.findComponent(StickyHeader);
 
   const createComponent = (props = {}) => {
     wrapper = shallowMountExtended(StickyHeader, {
       propsData: {
-        issuableStatus: STATUS_OPEN,
+        issuableState: STATUS_OPEN,
         issuableType: TYPE_ISSUE,
+        movedToIssueUrl: '',
+        promotedToEpicUrl: '',
+        duplicatedToIssueUrl: '',
         show: true,
         title: 'A sticky issue',
         ...props,
       },
+      stubs: {
+        GlBadge,
+        GlSprintf,
+        GlLink,
+      },
     });
   };
 
   it.each`
-    issuableType     | issuableStatus   | statusIcon
+    issuableType     | issuableState    | statusIcon
     ${TYPE_INCIDENT} | ${STATUS_OPEN}   | ${'issue-open-m'}
     ${TYPE_INCIDENT} | ${STATUS_CLOSED} | ${'issue-close'}
     ${TYPE_ISSUE}    | ${STATUS_OPEN}   | ${'issue-open-m'}
@@ -45,23 +56,74 @@ describe('StickyHeader component', () => {
     ${TYPE_EPIC}     | ${STATUS_OPEN}   | ${'issue-open-m'}
     ${TYPE_EPIC}     | ${STATUS_CLOSED} | ${'issue-close'}
   `(
-    'shows with state icon "$statusIcon" for $issuableType when status is $issuableStatus',
-    ({ issuableType, issuableStatus, statusIcon }) => {
-      createComponent({ issuableType, issuableStatus });
+    'shows with state icon "$statusIcon" for $issuableType when status is $issuableState',
+    ({ issuableType, issuableState, statusIcon }) => {
+      createComponent({ issuableType, issuableState });
 
       expect(wrapper.findComponent(GlBadge).props('icon')).toBe(statusIcon);
     },
   );
 
   it.each`
-    title                                        | issuableStatus
+    title                                        | issuableState
     ${'shows with Open when status is opened'}   | ${STATUS_OPEN}
     ${'shows with Closed when status is closed'} | ${STATUS_CLOSED}
     ${'shows with Open when status is reopened'} | ${STATUS_REOPENED}
-  `('$title', ({ issuableStatus }) => {
-    createComponent({ issuableStatus });
+  `('$title', ({ issuableState }) => {
+    createComponent({ issuableState });
 
-    expect(wrapper.text()).toContain(issuableStatusText[issuableStatus]);
+    expect(wrapper.text()).toContain(issuableStatusText[issuableState]);
+  });
+
+  describe('when status is closed', () => {
+    beforeEach(() => {
+      createComponent({ issuableState: STATUS_CLOSED });
+    });
+
+    describe('when issue is marked as duplicate', () => {
+      beforeEach(() => {
+        createComponent({
+          issuableState: STATUS_CLOSED,
+          duplicatedToIssueUrl: 'project/-/issue/5',
+        });
+      });
+
+      it('renders `Closed (duplicated)`', () => {
+        expect(findIssuableHeader().text()).toContain('Closed (duplicated)');
+      });
+
+      it('links to the duplicated issue', () => {
+        expect(findClosedStatusLink().attributes('href')).toBe('project/-/issue/5');
+      });
+    });
+
+    describe('when issue is marked as moved', () => {
+      beforeEach(() => {
+        createComponent({ issuableState: STATUS_CLOSED, movedToIssueUrl: 'project/-/issue/6' });
+      });
+
+      it('renders `Closed (moved)`', () => {
+        expect(findIssuableHeader().text()).toContain('Closed (moved)');
+      });
+
+      it('links to the moved issue', () => {
+        expect(findClosedStatusLink().attributes('href')).toBe('project/-/issue/6');
+      });
+    });
+
+    describe('when issue is marked as promoted', () => {
+      beforeEach(() => {
+        createComponent({ issuableState: STATUS_CLOSED, promotedToEpicUrl: 'group/-/epic/7' });
+      });
+
+      it('renders `Closed (promoted)`', () => {
+        expect(findIssuableHeader().text()).toContain('Closed (promoted)');
+      });
+
+      it('links to the promoted epic', () => {
+        expect(findClosedStatusLink().attributes('href')).toBe('group/-/epic/7');
+      });
+    });
   });
 
   it.each`
diff --git a/spec/frontend/repository/components/commit_info_spec.js b/spec/frontend/repository/components/commit_info_spec.js
index 474b020320b..dcda3551258 100644
--- a/spec/frontend/repository/components/commit_info_spec.js
+++ b/spec/frontend/repository/components/commit_info_spec.js
@@ -53,6 +53,8 @@ describe('Repository last commit component', () => {
     expect(findCommitterWrapper().classes()).toEqual([
       'committer',
       'gl-basis-full',
+      'gl-truncate',
+      'gl-text-sm',
       'gl-inline-flex',
     ]);
     expect(findUserLink().classes()).toEqual([
diff --git a/spec/lib/gitlab/database/load_balancing/sidekiq_server_middleware_spec.rb b/spec/lib/gitlab/database/load_balancing/sidekiq_server_middleware_spec.rb
index 7eb303b63bb..ca5a8041cdf 100644
--- a/spec/lib/gitlab/database/load_balancing/sidekiq_server_middleware_spec.rb
+++ b/spec/lib/gitlab/database/load_balancing/sidekiq_server_middleware_spec.rb
@@ -233,7 +233,7 @@ RSpec.describe Gitlab::Database::LoadBalancing::SidekiqServerMiddleware, :clean_
           it 'raises an error and retries', :aggregate_failures do
             expect do
               Gitlab::SidekiqSharding::Validator.allow_unrouted_sidekiq_calls { process_job(job) }
-            end.to raise_error(Sidekiq::JobRetry::Skip)
+            end.to raise_error(Sidekiq::JobRetry::Handled)
 
             job_for_retry = Gitlab::SidekiqSharding::Validator.allow_unrouted_sidekiq_calls { Sidekiq::RetrySet.new.first }
             expect(job_for_retry['error_class']).to eq('Gitlab::Database::LoadBalancing::SidekiqServerMiddleware::JobReplicaNotUpToDate')
diff --git a/spec/lib/gitlab/database/no_cross_db_foreign_keys_spec.rb b/spec/lib/gitlab/database/no_cross_db_foreign_keys_spec.rb
index 0c82beb0351..79ab72b768c 100644
--- a/spec/lib/gitlab/database/no_cross_db_foreign_keys_spec.rb
+++ b/spec/lib/gitlab/database/no_cross_db_foreign_keys_spec.rb
@@ -72,7 +72,8 @@ RSpec.describe 'cross-database foreign keys' do
       'dast_site_profiles.dast_site_id',
       'dast_site_profiles_builds.dast_site_profile_id',
       'dast_site_validations.dast_site_token_id',
-      'dast_sites.dast_site_validation_id'
+      'dast_sites.dast_site_validation_id',
+      'dast_site_profile_secret_variables.dast_site_profile_id'
     ]
   end
 
diff --git a/spec/lib/gitlab/sidekiq_logging/structured_logger_spec.rb b/spec/lib/gitlab/sidekiq_logging/structured_logger_spec.rb
index b1a8a9f4da3..cdac395b74a 100644
--- a/spec/lib/gitlab/sidekiq_logging/structured_logger_spec.rb
+++ b/spec/lib/gitlab/sidekiq_logging/structured_logger_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Gitlab::SidekiqLogging::StructuredLogger do
+RSpec.describe Gitlab::SidekiqLogging::StructuredLogger, feature_category: :shared do
   before do
     # We disable a memory instrumentation feature
     # as this requires a special patched Ruby
@@ -492,7 +492,13 @@ RSpec.describe Gitlab::SidekiqLogging::StructuredLogger do
         'completed_at' => current_utc_time.to_i }
     end
 
-    subject { described_class.new(Sidekiq.logger) }
+    let(:config) do
+      config = Sidekiq::Config.new
+      config.logger = Sidekiq.logger
+      config
+    end
+
+    subject { described_class.new(config) }
 
     it 'update payload correctly' do
       travel_to(current_utc_time) do
diff --git a/spec/models/user_preference_spec.rb b/spec/models/user_preference_spec.rb
index a642ed3520f..03d0d801c3f 100644
--- a/spec/models/user_preference_spec.rb
+++ b/spec/models/user_preference_spec.rb
@@ -198,69 +198,6 @@ RSpec.describe UserPreference, feature_category: :user_profile do
     end
   end
 
-  describe '#tab_width' do
-    it 'is set to 8 by default' do
-      # Intentionally not using factory here to test the constructor.
-      pref = described_class.new
-
-      expect(pref.tab_width).to eq(8)
-    end
-
-    it 'returns default value when assigning nil' do
-      pref = described_class.new(tab_width: nil)
-
-      expect(pref.tab_width).to eq(8)
-    end
-  end
-
-  describe '#tab_width=' do
-    it 'sets to default value when nil' do
-      pref = described_class.new(tab_width: nil)
-
-      expect(pref.read_attribute(:tab_width)).to eq(8)
-    end
-
-    it 'sets user values' do
-      pref = described_class.new(tab_width: 12)
-
-      expect(pref.read_attribute(:tab_width)).to eq(12)
-    end
-  end
-
-  describe '#time_display_relative' do
-    it 'is set to true by default' do
-      pref = described_class.new
-
-      expect(pref.time_display_relative).to eq(true)
-    end
-
-    it 'returns default value when assigning nil' do
-      pref = described_class.new(time_display_relative: nil)
-
-      expect(pref.time_display_relative).to eq(true)
-    end
-
-    it 'returns assigned value' do
-      pref = described_class.new(time_display_relative: false)
-
-      expect(pref.time_display_relative).to eq(false)
-    end
-  end
-
-  describe '#time_display_relative=' do
-    it 'sets to default value when nil' do
-      pref = described_class.new(time_display_relative: nil)
-
-      expect(pref.read_attribute(:time_display_relative)).to eq(true)
-    end
-
-    it 'sets user values' do
-      pref = described_class.new(time_display_relative: false)
-
-      expect(pref.read_attribute(:time_display_relative)).to eq(false)
-    end
-  end
-
   describe '#project_shortcut_buttons' do
     it 'is set to true by default' do
       pref = described_class.new
@@ -289,40 +226,6 @@ RSpec.describe UserPreference, feature_category: :user_profile do
     end
   end
 
-  describe '#render_whitespace_in_code' do
-    it 'is set to false by default' do
-      pref = described_class.new
-
-      expect(pref.render_whitespace_in_code).to eq(false)
-    end
-
-    it 'returns default value when assigning nil' do
-      pref = described_class.new(render_whitespace_in_code: nil)
-
-      expect(pref.render_whitespace_in_code).to eq(false)
-    end
-
-    it 'returns assigned value' do
-      pref = described_class.new(render_whitespace_in_code: true)
-
-      expect(pref.render_whitespace_in_code).to eq(true)
-    end
-  end
-
-  describe '#render_whitespace_in_code=' do
-    it 'sets to default value when nil' do
-      pref = described_class.new(render_whitespace_in_code: nil)
-
-      expect(pref.read_attribute(:render_whitespace_in_code)).to eq(false)
-    end
-
-    it 'sets user values' do
-      pref = described_class.new(render_whitespace_in_code: true)
-
-      expect(pref.read_attribute(:render_whitespace_in_code)).to eq(true)
-    end
-  end
-
   describe '#early_access_event_tracking?' do
     let(:participant) { true }
     let(:tracking) { true }
diff --git a/spec/models/virtual_registries/packages/maven/registry_spec.rb b/spec/models/virtual_registries/packages/maven/registry_spec.rb
index 7b5f5db3ad9..dc961bcbace 100644
--- a/spec/models/virtual_registries/packages/maven/registry_spec.rb
+++ b/spec/models/virtual_registries/packages/maven/registry_spec.rb
@@ -36,4 +36,21 @@ RSpec.describe VirtualRegistries::Packages::Maven::Registry, type: :model, featu
 
     it { is_expected.to eq([registry]) }
   end
+
+  describe 'callbacks' do
+    describe '.destroy_upstream' do
+      let(:upstream) { build(:virtual_registries_packages_maven_upstream) }
+
+      before do
+        allow(registry).to receive(:upstream).and_return(upstream)
+        allow(upstream).to receive(:destroy!)
+      end
+
+      it 'destroys the upstream' do
+        registry.destroy!
+
+        expect(upstream).to have_received(:destroy!)
+      end
+    end
+  end
 end
diff --git a/spec/requests/api/graphql/ci/runners_spec.rb b/spec/requests/api/graphql/ci/runners_spec.rb
index 667882ffa7e..40159443663 100644
--- a/spec/requests/api/graphql/ci/runners_spec.rb
+++ b/spec/requests/api/graphql/ci/runners_spec.rb
@@ -347,7 +347,7 @@ RSpec.describe 'Query.runners', feature_category: :fleet_visibility do
   end
 end
 
-RSpec.describe 'Group.runners' do
+RSpec.describe 'Group.runners', feature_category: :fleet_visibility do
   include GraphqlHelpers
 
   let_it_be(:group) { create(:group) }
diff --git a/spec/support/shared_contexts/jobs/handling_retried_jobs_shared_context.rb b/spec/support/shared_contexts/jobs/handling_retried_jobs_shared_context.rb
index 428eff77373..a4b7a463ec1 100644
--- a/spec/support/shared_contexts/jobs/handling_retried_jobs_shared_context.rb
+++ b/spec/support/shared_contexts/jobs/handling_retried_jobs_shared_context.rb
@@ -19,7 +19,7 @@ RSpec.shared_context 'when handling retried jobs' do |url|
 
     begin
       Sidekiq::JobRetry.new(Sidekiq).local(klass, message, klass.queue) { raise 'boom' }
-    rescue Sidekiq::JobRetry::Skip
+    rescue Sidekiq::JobRetry::Handled
       # Sidekiq scheduled the retry
     end
   end
diff --git a/spec/support/shared_contexts/lib/gitlab/sidekiq_logging/structured_logger_shared_context.rb b/spec/support/shared_contexts/lib/gitlab/sidekiq_logging/structured_logger_shared_context.rb
index 5aae837e1b1..0481ab8d691 100644
--- a/spec/support/shared_contexts/lib/gitlab/sidekiq_logging/structured_logger_shared_context.rb
+++ b/spec/support/shared_contexts/lib/gitlab/sidekiq_logging/structured_logger_shared_context.rb
@@ -92,6 +92,12 @@ RSpec.shared_context 'structured_logger' do
     )
   end
 
+  let(:config) do
+    config = Sidekiq::Config.new
+    config.logger = logger
+    config
+  end
+
   before do
     allow(subject).to receive(:current_time).and_return(timestamp.to_f)
 
@@ -102,7 +108,7 @@ RSpec.shared_context 'structured_logger' do
     allow(Process).to receive(:clock_gettime).with(anything, :float_millisecond).and_call_original
   end
 
-  subject { described_class.new(logger) }
+  subject { described_class.new(config) }
 
   def call_subject(job, queue)
     # This structured logger strongly depends on execution of `InstrumentationLogger`
diff --git a/spec/support/shared_examples/lib/gitlab/background_migration/backfill_desired_sharding_key_shared_examples.rb b/spec/support/shared_examples/lib/gitlab/background_migration/backfill_desired_sharding_key_shared_examples.rb
index 2a32874056e..212f68c14f5 100644
--- a/spec/support/shared_examples/lib/gitlab/background_migration/backfill_desired_sharding_key_shared_examples.rb
+++ b/spec/support/shared_examples/lib/gitlab/background_migration/backfill_desired_sharding_key_shared_examples.rb
@@ -27,7 +27,11 @@ RSpec.shared_examples 'desired sharding key backfill job' do
       vulnerability_flags: {
         vulnerability_occurrences: 'https://gitlab.com/gitlab-org/gitlab/-/issues/480354'
       },
-      dast_site_validations: { dast_site_tokens: 'https://gitlab.com/gitlab-org/gitlab/-/issues/474985' }
+      dast_site_validations: { dast_site_tokens: 'https://gitlab.com/gitlab-org/gitlab/-/issues/474985' },
+      dast_site_profile_secret_variables: {
+        dast_site_profiles: 'https://gitlab.com/gitlab-org/gitlab/-/issues/480014'
+      },
+      dast_site_profiles_builds: { dast_site_profiles: 'https://gitlab.com/gitlab-org/gitlab/-/issues/480014' }
     }
   end
 
diff --git a/spec/support/shared_examples/loose_foreign_keys/have_loose_foreign_key.rb b/spec/support/shared_examples/loose_foreign_keys/have_loose_foreign_key.rb
index 5137afef1bd..b7ba3a784af 100644
--- a/spec/support/shared_examples/loose_foreign_keys/have_loose_foreign_key.rb
+++ b/spec/support/shared_examples/loose_foreign_keys/have_loose_foreign_key.rb
@@ -69,8 +69,8 @@ RSpec.shared_examples 'cleanup by a loose foreign key' do
   def find_model
     query = model.class
     # handle composite primary keys
-    connection = model.class.connection
-    connection.primary_keys(model.class.table_name).each do |primary_key|
+    primary_keys = model.class.connection.primary_keys(model.class.table_name) - model.class.ignored_columns
+    primary_keys.each do |primary_key|
       query = query.where(primary_key => model.public_send(primary_key))
     end
     query.first
diff --git a/vendor/gems/sidekiq-7.2.4/.gitlab-ci.yml b/vendor/gems/sidekiq/.gitlab-ci.yml
similarity index 92%
rename from vendor/gems/sidekiq-7.2.4/.gitlab-ci.yml
rename to vendor/gems/sidekiq/.gitlab-ci.yml
index ff9efb306ca..396922d009f 100644
--- a/vendor/gems/sidekiq-7.2.4/.gitlab-ci.yml
+++ b/vendor/gems/sidekiq/.gitlab-ci.yml
@@ -1,7 +1,7 @@
 include:
   - local: gems/gem.gitlab-ci.yml
     inputs:
-      gem_name: "sidekiq-7.2.4"
+      gem_name: "sidekiq"
       gem_path_prefix: "vendor/gems/"
 
 rspec:
diff --git a/vendor/gems/sidekiq-7.2.4/Changes.md b/vendor/gems/sidekiq/Changes.md
similarity index 97%
rename from vendor/gems/sidekiq-7.2.4/Changes.md
rename to vendor/gems/sidekiq/Changes.md
index 34fdca72989..19561399fc5 100644
--- a/vendor/gems/sidekiq-7.2.4/Changes.md
+++ b/vendor/gems/sidekiq/Changes.md
@@ -2,6 +2,49 @@
 
 [Sidekiq Changes](https://github.com/sidekiq/sidekiq/blob/main/Changes.md) | [Sidekiq Pro Changes](https://github.com/sidekiq/sidekiq/blob/main/Pro-Changes.md) | [Sidekiq Enterprise Changes](https://github.com/sidekiq/sidekiq/blob/main/Ent-Changes.md)
 
+7.3.1
+----------
+
+- Don't count job interruptions as failures in metrics [#6386]
+- Add frozen string literal to a number of .rb files.
+- Fix frozen string error with style_tag and script_tag [#6371]
+- Fix an error on Ruby 2.7 because of usage of `Hash#except` [#6376]
+
+7.3.0
+----------
+
+- **NEW FEATURE** Add `Sidekiq::IterableJob`, iteration support for long-running jobs. [#6286, fatkodima]
+  Iterable jobs are interruptible and can restart quickly if
+  running during a deploy. You must ensure that `each_iteration`
+  doesn't take more than Sidekiq's `-t` timeout (default: 25 seconds). Iterable jobs must not implement `perform`.
+```ruby
+class ProcessArrayJob
+  include Sidekiq::IterableJob
+  def build_enumerator(*args, **kwargs)
+    array_enumerator(args, **kwargs)
+  end
+  def each_iteration(arg)
+    puts arg
+  end
+end
+ProcessArrayJob.perform_async(1, 2, 3)
+```
+See the [Iteration](//github.com/sidekiq/sidekiq/wiki/Iteration) wiki page and the RDoc in `Sidekiq::IterableJob`.
+This feature should be considered BETA until the next minor release.
+- **SECURITY** The Web UI no longer allows extensions to use `<script>`.
+  Adjust CSP to disallow inline scripts within the Web UI. Please see
+  `examples/webui-ext` for how to register Web UI extensions and use
+  dynamic CSS and JS. This will make Sidekiq immune to XSS attacks. [#6270]
+- Add config option, `:skip_default_job_logging` to disable Sidekiq's default
+  start/finish job logging. [#6200]
+- Allow `Sidekiq::Limiter.redis` to use Redis Cluster [#6288]
+- Retain CurrentAttributeѕ after inline execution [#6307]
+- Ignore non-existent CurrentAttributes attributes when restoring [#6341]
+- Raise default Redis {read,write,connect} timeouts from 1 to 3 seconds
+  to minimize ReadTimeoutErrors [#6162]
+- Add `logger` as a dependency since it will become bundled in Ruby 3.5 [#6320]
+- Ignore unsupported locales in the Web UI [#6313]
+
 7.2.4
 ----------
 
diff --git a/vendor/gems/sidekiq-7.2.4/Gemfile b/vendor/gems/sidekiq/Gemfile
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/Gemfile
rename to vendor/gems/sidekiq/Gemfile
diff --git a/vendor/gems/sidekiq-7.2.4/Gemfile.lock b/vendor/gems/sidekiq/Gemfile.lock
similarity index 98%
rename from vendor/gems/sidekiq-7.2.4/Gemfile.lock
rename to vendor/gems/sidekiq/Gemfile.lock
index d80acea98bb..4b5e303b238 100644
--- a/vendor/gems/sidekiq-7.2.4/Gemfile.lock
+++ b/vendor/gems/sidekiq/Gemfile.lock
@@ -1,11 +1,12 @@
 PATH
   remote: .
   specs:
-    sidekiq (7.2.4)
+    sidekiq (7.3.1)
       concurrent-ruby (< 2)
       connection_pool (>= 2.3.0)
+      logger
       rack (>= 2.2.4)
-      redis-client (>= 0.19.0)
+      redis-client (>= 0.22.2)
 
 GEM
   remote: https://rubygems.org/
diff --git a/vendor/gems/sidekiq-7.2.4/LICENSE.txt b/vendor/gems/sidekiq/LICENSE.txt
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/LICENSE.txt
rename to vendor/gems/sidekiq/LICENSE.txt
diff --git a/vendor/gems/sidekiq-7.2.4/NOTICE.txt b/vendor/gems/sidekiq/NOTICE.txt
similarity index 77%
rename from vendor/gems/sidekiq-7.2.4/NOTICE.txt
rename to vendor/gems/sidekiq/NOTICE.txt
index 9b389b6bea3..ac9637f74b8 100644
--- a/vendor/gems/sidekiq-7.2.4/NOTICE.txt
+++ b/vendor/gems/sidekiq/NOTICE.txt
@@ -3,11 +3,10 @@ Copyright (c) Contributed Systems LLC
 This product includes software developed at
 Contributed Systems LLC(https://contribsys.com/).
 
-Modifications to the following files were made on 2024-08-22 by GitLab:
+Modifications to the following files were made on 2024-08-29 by GitLab:
 - lib/sidekiq/redis_client_adapter.rb
 - lib/sidekiq/api.rb
 - lib/sidekiq/cli.rb
 - lib/sidekiq/paginator.rb
 - lib/sidekiq/scheduled.rb
 - sidekiq.gemspec
-- test/web_test.rb
diff --git a/vendor/gems/sidekiq-7.2.4/README.md b/vendor/gems/sidekiq/README.md
similarity index 98%
rename from vendor/gems/sidekiq-7.2.4/README.md
rename to vendor/gems/sidekiq/README.md
index 2e047d4a181..09aa723fd72 100644
--- a/vendor/gems/sidekiq-7.2.4/README.md
+++ b/vendor/gems/sidekiq/README.md
@@ -86,7 +86,7 @@ Useful resources:
 * Occasional announcements are made to the [@sidekiq](https://ruby.social/@sidekiq) Mastodon account.
 * The [Sidekiq tag](https://stackoverflow.com/questions/tagged/sidekiq) on Stack Overflow has lots of useful Q &amp; A.
 
-Every Friday morning is Sidekiq office hour: I video chat and answer questions.
+Every Thursday morning is Sidekiq office hour: I video chat and answer questions.
 See the [Sidekiq support page](https://sidekiq.org/support.html) for details.
 
 Contributing
diff --git a/vendor/gems/sidekiq-7.2.4/Rakefile b/vendor/gems/sidekiq/Rakefile
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/Rakefile
rename to vendor/gems/sidekiq/Rakefile
diff --git a/vendor/gems/sidekiq-7.2.4/bin/multi_queue_bench b/vendor/gems/sidekiq/bin/multi_queue_bench
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/bin/multi_queue_bench
rename to vendor/gems/sidekiq/bin/multi_queue_bench
diff --git a/vendor/gems/sidekiq-7.2.4/bin/sidekiq b/vendor/gems/sidekiq/bin/sidekiq
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/bin/sidekiq
rename to vendor/gems/sidekiq/bin/sidekiq
diff --git a/vendor/gems/sidekiq-7.2.4/bin/sidekiqload b/vendor/gems/sidekiq/bin/sidekiqload
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/bin/sidekiqload
rename to vendor/gems/sidekiq/bin/sidekiqload
diff --git a/vendor/gems/sidekiq-7.2.4/bin/sidekiqmon b/vendor/gems/sidekiq/bin/sidekiqmon
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/bin/sidekiqmon
rename to vendor/gems/sidekiq/bin/sidekiqmon
diff --git a/vendor/gems/sidekiq-7.2.4/lib/generators/sidekiq/job_generator.rb b/vendor/gems/sidekiq/lib/generators/sidekiq/job_generator.rb
similarity index 97%
rename from vendor/gems/sidekiq-7.2.4/lib/generators/sidekiq/job_generator.rb
rename to vendor/gems/sidekiq/lib/generators/sidekiq/job_generator.rb
index dcf7dd59f5d..aadadf5481f 100644
--- a/vendor/gems/sidekiq-7.2.4/lib/generators/sidekiq/job_generator.rb
+++ b/vendor/gems/sidekiq/lib/generators/sidekiq/job_generator.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "rails/generators/named_base"
 
 module Sidekiq
diff --git a/vendor/gems/sidekiq-7.2.4/lib/generators/sidekiq/templates/job.rb.erb b/vendor/gems/sidekiq/lib/generators/sidekiq/templates/job.rb.erb
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/lib/generators/sidekiq/templates/job.rb.erb
rename to vendor/gems/sidekiq/lib/generators/sidekiq/templates/job.rb.erb
diff --git a/vendor/gems/sidekiq-7.2.4/lib/generators/sidekiq/templates/job_spec.rb.erb b/vendor/gems/sidekiq/lib/generators/sidekiq/templates/job_spec.rb.erb
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/lib/generators/sidekiq/templates/job_spec.rb.erb
rename to vendor/gems/sidekiq/lib/generators/sidekiq/templates/job_spec.rb.erb
diff --git a/vendor/gems/sidekiq-7.2.4/lib/generators/sidekiq/templates/job_test.rb.erb b/vendor/gems/sidekiq/lib/generators/sidekiq/templates/job_test.rb.erb
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/lib/generators/sidekiq/templates/job_test.rb.erb
rename to vendor/gems/sidekiq/lib/generators/sidekiq/templates/job_test.rb.erb
diff --git a/vendor/gems/sidekiq-7.2.4/lib/sidekiq.rb b/vendor/gems/sidekiq/lib/sidekiq.rb
similarity index 98%
rename from vendor/gems/sidekiq-7.2.4/lib/sidekiq.rb
rename to vendor/gems/sidekiq/lib/sidekiq.rb
index c997b46e662..df030f89270 100644
--- a/vendor/gems/sidekiq-7.2.4/lib/sidekiq.rb
+++ b/vendor/gems/sidekiq/lib/sidekiq.rb
@@ -32,6 +32,7 @@ require "sidekiq/logger"
 require "sidekiq/client"
 require "sidekiq/transaction_aware_client"
 require "sidekiq/job"
+require "sidekiq/iterable_job"
 require "sidekiq/worker_compatibility_alias"
 require "sidekiq/redis_client_adapter"
 
@@ -112,7 +113,7 @@ module Sidekiq
   #   end
   #   inst.run
   #   sleep 10
-  #   inst.terminate
+  #   inst.stop
   #
   # NB: it is really easy to overload a Ruby process with threads due to the GIL.
   # I do not recommend setting concurrency higher than 2-3.
diff --git a/vendor/gems/sidekiq-7.2.4/lib/sidekiq/api.rb b/vendor/gems/sidekiq/lib/sidekiq/api.rb
similarity index 98%
rename from vendor/gems/sidekiq-7.2.4/lib/sidekiq/api.rb
rename to vendor/gems/sidekiq/lib/sidekiq/api.rb
index 0739044faae..9895da2485f 100644
--- a/vendor/gems/sidekiq-7.2.4/lib/sidekiq/api.rb
+++ b/vendor/gems/sidekiq/lib/sidekiq/api.rb
@@ -813,6 +813,8 @@ module Sidekiq
 
     # Add the given job to the Dead set.
     # @param message [String] the job data as JSON
+    # @option opts :notify_failure [Boolean] (true) Whether death handlers should be called
+    # @option opts :ex [Exception] (RuntimeError) An exception to pass to the death handlers
     def kill(message, opts = {})
       now = Time.now.to_f
       Sidekiq.redis do |conn|
@@ -825,10 +827,14 @@ module Sidekiq
 
       if opts[:notify_failure] != false
         job = Sidekiq.load_json(message)
-        r = RuntimeError.new("Job killed by API")
-        r.set_backtrace(caller)
+        if opts[:ex]
+          ex = opt[:ex]
+        else
+          ex = RuntimeError.new("Job killed by API")
+          ex.set_backtrace(caller)
+        end
         Sidekiq.default_configuration.death_handlers.each do |handle|
-          handle.call(job, r)
+          handle.call(job, ex)
         end
       end
       true
@@ -1199,7 +1205,7 @@ module Sidekiq
       @hsh.send(*all)
     end
 
-    def respond_to_missing?(name)
+    def respond_to_missing?(name, *args)
       @hsh.respond_to?(name)
     end
   end
diff --git a/vendor/gems/sidekiq-7.2.4/lib/sidekiq/capsule.rb b/vendor/gems/sidekiq/lib/sidekiq/capsule.rb
similarity index 96%
rename from vendor/gems/sidekiq-7.2.4/lib/sidekiq/capsule.rb
rename to vendor/gems/sidekiq/lib/sidekiq/capsule.rb
index 3080938abb8..e696d583945 100644
--- a/vendor/gems/sidekiq-7.2.4/lib/sidekiq/capsule.rb
+++ b/vendor/gems/sidekiq/lib/sidekiq/capsule.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "sidekiq/component"
 
 module Sidekiq
@@ -17,6 +19,7 @@ module Sidekiq
   # end
   class Capsule
     include Sidekiq::Component
+    extend Forwardable
 
     attr_reader :name
     attr_reader :queues
@@ -24,6 +27,8 @@ module Sidekiq
     attr_reader :mode
     attr_reader :weights
 
+    def_delegators :@config, :[], :[]=, :fetch, :key?, :has_key?, :merge!, :dig
+
     def initialize(name, config)
       @name = name
       @config = config
diff --git a/vendor/gems/sidekiq-7.2.4/lib/sidekiq/cli.rb b/vendor/gems/sidekiq/lib/sidekiq/cli.rb
similarity index 99%
rename from vendor/gems/sidekiq-7.2.4/lib/sidekiq/cli.rb
rename to vendor/gems/sidekiq/lib/sidekiq/cli.rb
index 8dcf9747348..a0132ab1a48 100644
--- a/vendor/gems/sidekiq-7.2.4/lib/sidekiq/cli.rb
+++ b/vendor/gems/sidekiq/lib/sidekiq/cli.rb
@@ -423,3 +423,4 @@ end
 
 require "sidekiq/systemd"
 require "sidekiq/metrics/tracking"
+require "sidekiq/job/interrupt_handler"
diff --git a/vendor/gems/sidekiq-7.2.4/lib/sidekiq/client.rb b/vendor/gems/sidekiq/lib/sidekiq/client.rb
similarity index 98%
rename from vendor/gems/sidekiq-7.2.4/lib/sidekiq/client.rb
rename to vendor/gems/sidekiq/lib/sidekiq/client.rb
index fa06969cf10..1c807aadb6f 100644
--- a/vendor/gems/sidekiq-7.2.4/lib/sidekiq/client.rb
+++ b/vendor/gems/sidekiq/lib/sidekiq/client.rb
@@ -248,9 +248,12 @@ module Sidekiq
     def atomic_push(conn, payloads)
       if payloads.first.key?("at")
         conn.zadd("schedule", payloads.flat_map { |hash|
-          at = hash.delete("at").to_s
+          at = hash["at"].to_s
           # ActiveJob sets this but the job has not been enqueued yet
           hash.delete("enqueued_at")
+          # TODO: Use hash.except("at") when support for Ruby 2.7 is dropped
+          hash = hash.dup
+          hash.delete("at")
           [at, Sidekiq.dump_json(hash)]
         })
       else
diff --git a/vendor/gems/sidekiq-7.2.4/lib/sidekiq/component.rb b/vendor/gems/sidekiq/lib/sidekiq/component.rb
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/lib/sidekiq/component.rb
rename to vendor/gems/sidekiq/lib/sidekiq/component.rb
diff --git a/vendor/gems/sidekiq-7.2.4/lib/sidekiq/config.rb b/vendor/gems/sidekiq/lib/sidekiq/config.rb
similarity index 98%
rename from vendor/gems/sidekiq-7.2.4/lib/sidekiq/config.rb
rename to vendor/gems/sidekiq/lib/sidekiq/config.rb
index 7c41f58ee89..0b738f25660 100644
--- a/vendor/gems/sidekiq-7.2.4/lib/sidekiq/config.rb
+++ b/vendor/gems/sidekiq/lib/sidekiq/config.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "forwardable"
 
 require "set"
@@ -17,6 +19,10 @@ module Sidekiq
       poll_interval_average: nil,
       average_scheduled_poll_interval: 5,
       on_complex_arguments: :raise,
+      iteration: {
+        max_job_runtime: nil,
+        retry_backoff: 0
+      },
       error_handlers: [],
       death_handlers: [],
       lifecycle_events: {
@@ -52,7 +58,7 @@ module Sidekiq
       @capsules = {}
     end
 
-    def_delegators :@options, :[], :[]=, :fetch, :key?, :has_key?, :merge!
+    def_delegators :@options, :[], :[]=, :fetch, :key?, :has_key?, :merge!, :dig
     attr_reader :capsules
 
     def to_json(*)
diff --git a/vendor/gems/sidekiq-7.2.4/lib/sidekiq/deploy.rb b/vendor/gems/sidekiq/lib/sidekiq/deploy.rb
similarity index 98%
rename from vendor/gems/sidekiq-7.2.4/lib/sidekiq/deploy.rb
rename to vendor/gems/sidekiq/lib/sidekiq/deploy.rb
index 56cc9676090..fb782745fd2 100644
--- a/vendor/gems/sidekiq-7.2.4/lib/sidekiq/deploy.rb
+++ b/vendor/gems/sidekiq/lib/sidekiq/deploy.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "sidekiq/redis_connection"
 require "time"
 
diff --git a/vendor/gems/sidekiq-7.2.4/lib/sidekiq/embedded.rb b/vendor/gems/sidekiq/lib/sidekiq/embedded.rb
similarity index 98%
rename from vendor/gems/sidekiq-7.2.4/lib/sidekiq/embedded.rb
rename to vendor/gems/sidekiq/lib/sidekiq/embedded.rb
index e0c5ccd02cb..329fc954a2e 100644
--- a/vendor/gems/sidekiq-7.2.4/lib/sidekiq/embedded.rb
+++ b/vendor/gems/sidekiq/lib/sidekiq/embedded.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "sidekiq/component"
 require "sidekiq/launcher"
 require "sidekiq/metrics/tracking"
diff --git a/vendor/gems/sidekiq-7.2.4/lib/sidekiq/fetch.rb b/vendor/gems/sidekiq/lib/sidekiq/fetch.rb
similarity index 95%
rename from vendor/gems/sidekiq-7.2.4/lib/sidekiq/fetch.rb
rename to vendor/gems/sidekiq/lib/sidekiq/fetch.rb
index e7da668c12a..8b218ba0599 100644
--- a/vendor/gems/sidekiq-7.2.4/lib/sidekiq/fetch.rb
+++ b/vendor/gems/sidekiq/lib/sidekiq/fetch.rb
@@ -44,7 +44,7 @@ module Sidekiq # :nodoc:
         return nil
       end
 
-      queue, job = redis { |conn| conn.blocking_call(conn.read_timeout + TIMEOUT, "brpop", *qs, TIMEOUT) }
+      queue, job = redis { |conn| conn.blocking_call(TIMEOUT, "brpop", *qs, TIMEOUT) }
       UnitOfWork.new(queue, job, config) if queue
     end
 
diff --git a/vendor/gems/sidekiq/lib/sidekiq/iterable_job.rb b/vendor/gems/sidekiq/lib/sidekiq/iterable_job.rb
new file mode 100644
index 00000000000..b45ddb6b893
--- /dev/null
+++ b/vendor/gems/sidekiq/lib/sidekiq/iterable_job.rb
@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+require "sidekiq/job/iterable"
+
+# Iterable jobs are ones which provide a sequence to process using
+# `build_enumerator(*args, cursor: cursor)` and then process each
+# element of that sequence in `each_iteration(item, *args)`.
+#
+# The job is kicked off as normal:
+#
+#     ProcessUserSet.perform_async(123)
+#
+# but instead of calling `perform`, Sidekiq will call:
+#
+#     enum = ProcessUserSet#build_enumerator(123, cursor:nil)
+#
+# Your Enumerator must yield `(object, updated_cursor)` and
+# Sidekiq will call your `each_iteration` method:
+#
+#     ProcessUserSet#each_iteration(object, 123)
+#
+# After every iteration, Sidekiq will check for shutdown. If we are
+# stopping, the cursor will be saved to Redis and the job re-queued
+# to pick up the rest of the work upon restart. Your job will get
+# the updated_cursor so it can pick up right where it stopped.
+#
+#     enum = ProcessUserSet#build_enumerator(123, cursor: updated_cursor)
+#
+# The cursor object must be serializable to JSON.
+#
+# Note there are several APIs to help you build enumerators for
+# ActiveRecord Relations, CSV files, etc. See sidekiq/job/iterable/*.rb.
+module Sidekiq
+  module IterableJob
+    def self.included(base)
+      base.include Sidekiq::Job
+      base.include Sidekiq::Job::Iterable
+    end
+
+    # def build_enumerator(*args, cursor:)
+    # def each_iteration(item, *args)
+
+    # Your job can also define several callbacks during points
+    # in each job's lifecycle.
+    #
+    # def on_start
+    # def on_resume
+    # def on_stop
+    # def on_complete
+    # def around_iteration
+    #
+    # To keep things simple and compatible, this is the same
+    # API as the `sidekiq-iteration` gem.
+  end
+end
diff --git a/vendor/gems/sidekiq-7.2.4/lib/sidekiq/job.rb b/vendor/gems/sidekiq/lib/sidekiq/job.rb
similarity index 96%
rename from vendor/gems/sidekiq-7.2.4/lib/sidekiq/job.rb
rename to vendor/gems/sidekiq/lib/sidekiq/job.rb
index 31db39add58..2e9a54b4aef 100644
--- a/vendor/gems/sidekiq-7.2.4/lib/sidekiq/job.rb
+++ b/vendor/gems/sidekiq/lib/sidekiq/job.rb
@@ -69,7 +69,11 @@ module Sidekiq
         # In practice, any option is allowed.  This is the main mechanism to configure the
         # options for a specific job.
         def sidekiq_options(opts = {})
-          opts = opts.transform_keys(&:to_s) # stringify
+          # stringify 2 levels of keys
+          opts = opts.to_h do |k, v|
+            [k.to_s, (Hash === v) ? v.transform_keys(&:to_s) : v]
+          end
+
           self.sidekiq_options_hash = get_sidekiq_options.merge(opts)
         end
 
@@ -155,6 +159,9 @@ module Sidekiq
 
     attr_accessor :jid
 
+    # This attribute is implementation-specific and not a public API
+    attr_accessor :_context
+
     def self.included(base)
       raise ArgumentError, "Sidekiq::Job cannot be included in an ActiveJob: #{base.name}" if base.ancestors.any? { |c| c.name == "ActiveJob::Base" }
 
@@ -166,6 +173,10 @@ module Sidekiq
       Sidekiq.logger
     end
 
+    def interrupted?
+      @_context&.stopping?
+    end
+
     # This helper class encapsulates the set options for `set`, e.g.
     #
     #     SomeJob.set(queue: 'foo').perform_async(....)
@@ -366,7 +377,7 @@ module Sidekiq
 
       def build_client # :nodoc:
         pool = Thread.current[:sidekiq_redis_pool] || get_sidekiq_options["pool"] || Sidekiq.default_configuration.redis_pool
-        client_class = get_sidekiq_options["client_class"] || Sidekiq::Client
+        client_class = Thread.current[:sidekiq_client_class] || get_sidekiq_options["client_class"] || Sidekiq::Client
         client_class.new(pool: pool)
       end
     end
diff --git a/vendor/gems/sidekiq/lib/sidekiq/job/interrupt_handler.rb b/vendor/gems/sidekiq/lib/sidekiq/job/interrupt_handler.rb
new file mode 100644
index 00000000000..3108bf7fbec
--- /dev/null
+++ b/vendor/gems/sidekiq/lib/sidekiq/job/interrupt_handler.rb
@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Sidekiq
+  module Job
+    class InterruptHandler
+      include Sidekiq::ServerMiddleware
+
+      def call(instance, hash, queue)
+        yield
+      rescue Interrupted
+        logger.debug "Interrupted, re-queueing..."
+        c = Sidekiq::Client.new
+        c.push(hash)
+        raise Sidekiq::JobRetry::Skip
+      end
+    end
+  end
+end
+
+Sidekiq.configure_server do |config|
+  config.server_middleware do |chain|
+    chain.add Sidekiq::Job::InterruptHandler
+  end
+end
diff --git a/vendor/gems/sidekiq/lib/sidekiq/job/iterable.rb b/vendor/gems/sidekiq/lib/sidekiq/job/iterable.rb
new file mode 100644
index 00000000000..8c33e720d7e
--- /dev/null
+++ b/vendor/gems/sidekiq/lib/sidekiq/job/iterable.rb
@@ -0,0 +1,231 @@
+# frozen_string_literal: true
+
+require_relative "iterable/enumerators"
+
+module Sidekiq
+  module Job
+    class Interrupted < ::RuntimeError; end
+
+    module Iterable
+      include Enumerators
+
+      # @api private
+      def self.included(base)
+        base.extend(ClassMethods)
+      end
+
+      # @api private
+      module ClassMethods
+        def method_added(method_name)
+          raise "#{self} is an iterable job and must not define #perform" if method_name == :perform
+          super
+        end
+      end
+
+      # @api private
+      def initialize
+        super
+
+        @_executions = 0
+        @_cursor = nil
+        @_start_time = nil
+        @_runtime = 0
+      end
+
+      # A hook to override that will be called when the job starts iterating.
+      #
+      # It is called only once, for the first time.
+      #
+      def on_start
+      end
+
+      # A hook to override that will be called around each iteration.
+      #
+      # Can be useful for some metrics collection, performance tracking etc.
+      #
+      def around_iteration
+        yield
+      end
+
+      # A hook to override that will be called when the job resumes iterating.
+      #
+      def on_resume
+      end
+
+      # A hook to override that will be called each time the job is interrupted.
+      #
+      # This can be due to interruption or sidekiq stopping.
+      #
+      def on_stop
+      end
+
+      # A hook to override that will be called when the job finished iterating.
+      #
+      def on_complete
+      end
+
+      # The enumerator to be iterated over.
+      #
+      # @return [Enumerator]
+      #
+      # @raise [NotImplementedError] with a message advising subclasses to
+      #     implement an override for this method.
+      #
+      def build_enumerator(*)
+        raise NotImplementedError, "#{self.class.name} must implement a '#build_enumerator' method"
+      end
+
+      # The action to be performed on each item from the enumerator.
+      #
+      # @return [void]
+      #
+      # @raise [NotImplementedError] with a message advising subclasses to
+      #     implement an override for this method.
+      #
+      def each_iteration(*)
+        raise NotImplementedError, "#{self.class.name} must implement an '#each_iteration' method"
+      end
+
+      def iteration_key
+        "it-#{jid}"
+      end
+
+      # @api private
+      def perform(*arguments)
+        fetch_previous_iteration_state
+
+        @_executions += 1
+        @_start_time = ::Process.clock_gettime(::Process::CLOCK_MONOTONIC)
+
+        enumerator = build_enumerator(*arguments, cursor: @_cursor)
+        unless enumerator
+          logger.info("'#build_enumerator' returned nil, skipping the job.")
+          return
+        end
+
+        assert_enumerator!(enumerator)
+
+        if @_executions == 1
+          on_start
+        else
+          on_resume
+        end
+
+        completed = catch(:abort) do
+          iterate_with_enumerator(enumerator, arguments)
+        end
+
+        on_stop
+        completed = handle_completed(completed)
+
+        if completed
+          on_complete
+          cleanup
+        else
+          reenqueue_iteration_job
+        end
+      end
+
+      private
+
+      def fetch_previous_iteration_state
+        state = Sidekiq.redis { |conn| conn.hgetall(iteration_key) }
+
+        unless state.empty?
+          @_executions = state["ex"].to_i
+          @_cursor = Sidekiq.load_json(state["c"])
+          @_runtime = state["rt"].to_f
+        end
+      end
+
+      STATE_FLUSH_INTERVAL = 5 # seconds
+      # we need to keep the state around as long as the job
+      # might be retrying
+      STATE_TTL = 30 * 24 * 60 * 60 # one month
+
+      def iterate_with_enumerator(enumerator, arguments)
+        found_record = false
+        state_flushed_at = ::Process.clock_gettime(::Process::CLOCK_MONOTONIC)
+
+        enumerator.each do |object, cursor|
+          found_record = true
+          @_cursor = cursor
+
+          is_interrupted = interrupted?
+          if ::Process.clock_gettime(::Process::CLOCK_MONOTONIC) - state_flushed_at >= STATE_FLUSH_INTERVAL || is_interrupted
+            flush_state
+            state_flushed_at = ::Process.clock_gettime(::Process::CLOCK_MONOTONIC)
+          end
+
+          return false if is_interrupted
+
+          around_iteration do
+            each_iteration(object, *arguments)
+          end
+        end
+
+        logger.debug("Enumerator found nothing to iterate!") unless found_record
+        true
+      ensure
+        @_runtime += (::Process.clock_gettime(::Process::CLOCK_MONOTONIC) - @_start_time)
+      end
+
+      def reenqueue_iteration_job
+        flush_state
+        logger.debug { "Interrupting job (cursor=#{@_cursor.inspect})" }
+
+        raise Interrupted
+      end
+
+      def assert_enumerator!(enum)
+        unless enum.is_a?(Enumerator)
+          raise ArgumentError, <<~MSG
+            #build_enumerator must return an Enumerator, but returned #{enum.class}.
+            Example:
+              def build_enumerator(params, cursor:)
+                active_record_records_enumerator(
+                  Shop.find(params["shop_id"]).products,
+                  cursor: cursor
+                )
+              end
+          MSG
+        end
+      end
+
+      def flush_state
+        key = iteration_key
+        state = {
+          "ex" => @_executions,
+          "c" => Sidekiq.dump_json(@_cursor),
+          "rt" => @_runtime
+        }
+
+        Sidekiq.redis do |conn|
+          conn.multi do |pipe|
+            pipe.hset(key, state)
+            pipe.expire(key, STATE_TTL)
+          end
+        end
+      end
+
+      def cleanup
+        logger.debug {
+          format("Completed iteration. executions=%d runtime=%.3f", @_executions, @_runtime)
+        }
+        Sidekiq.redis { |conn| conn.unlink(iteration_key) }
+      end
+
+      def handle_completed(completed)
+        case completed
+        when nil, # someone aborted the job but wants to call the on_complete callback
+             true
+          true
+        when false
+          false
+        else
+          raise "Unexpected thrown value: #{completed.inspect}"
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/gems/sidekiq/lib/sidekiq/job/iterable/active_record_enumerator.rb b/vendor/gems/sidekiq/lib/sidekiq/job/iterable/active_record_enumerator.rb
new file mode 100644
index 00000000000..d6b788cc77d
--- /dev/null
+++ b/vendor/gems/sidekiq/lib/sidekiq/job/iterable/active_record_enumerator.rb
@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+module Sidekiq
+  module Job
+    module Iterable
+      # @api private
+      class ActiveRecordEnumerator
+        def initialize(relation, cursor: nil, **options)
+          @relation = relation
+          @cursor = cursor
+          @options = options
+        end
+
+        def records
+          Enumerator.new(-> { @relation.count }) do |yielder|
+            @relation.find_each(**@options, start: @cursor) do |record|
+              yielder.yield(record, record.id)
+            end
+          end
+        end
+
+        def batches
+          Enumerator.new(-> { @relation.count }) do |yielder|
+            @relation.find_in_batches(**@options, start: @cursor) do |batch|
+              yielder.yield(batch, batch.last.id)
+            end
+          end
+        end
+
+        def relations
+          Enumerator.new(-> { relations_size }) do |yielder|
+            # Convenience to use :batch_size for all the
+            # ActiveRecord batching methods.
+            options = @options.dup
+            options[:of] ||= options.delete(:batch_size)
+
+            @relation.in_batches(**options, start: @cursor) do |relation|
+              last_record = relation.last
+              yielder.yield(relation, last_record.id)
+            end
+          end
+        end
+
+        private
+
+        def relations_size
+          batch_size = @options[:batch_size] || 1000
+          (@relation.count + batch_size - 1) / batch_size # ceiling division
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/gems/sidekiq/lib/sidekiq/job/iterable/csv_enumerator.rb b/vendor/gems/sidekiq/lib/sidekiq/job/iterable/csv_enumerator.rb
new file mode 100644
index 00000000000..a250700dea4
--- /dev/null
+++ b/vendor/gems/sidekiq/lib/sidekiq/job/iterable/csv_enumerator.rb
@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+module Sidekiq
+  module Job
+    module Iterable
+      # @api private
+      class CsvEnumerator
+        def initialize(csv)
+          unless defined?(CSV) && csv.instance_of?(CSV)
+            raise ArgumentError, "CsvEnumerator.new takes CSV object"
+          end
+
+          @csv = csv
+        end
+
+        def rows(cursor:)
+          @csv.lazy
+            .each_with_index
+            .drop(cursor || 0)
+            .to_enum { count_of_rows_in_file }
+        end
+
+        def batches(cursor:, batch_size: 100)
+          @csv.lazy
+            .each_slice(batch_size)
+            .with_index
+            .drop(cursor || 0)
+            .to_enum { (count_of_rows_in_file.to_f / batch_size).ceil }
+        end
+
+        private
+
+        def count_of_rows_in_file
+          filepath = @csv.path
+          return unless filepath
+
+          count = IO.popen(["wc", "-l", filepath]) do |out|
+            out.read.strip.to_i
+          end
+
+          count -= 1 if @csv.headers
+          count
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/gems/sidekiq/lib/sidekiq/job/iterable/enumerators.rb b/vendor/gems/sidekiq/lib/sidekiq/job/iterable/enumerators.rb
new file mode 100644
index 00000000000..b180ec2c170
--- /dev/null
+++ b/vendor/gems/sidekiq/lib/sidekiq/job/iterable/enumerators.rb
@@ -0,0 +1,135 @@
+# frozen_string_literal: true
+
+require_relative "active_record_enumerator"
+require_relative "csv_enumerator"
+
+module Sidekiq
+  module Job
+    module Iterable
+      module Enumerators
+        # Builds Enumerator object from a given array, using +cursor+ as an offset.
+        #
+        # @param array [Array]
+        # @param cursor [Integer] offset to start iteration from
+        #
+        # @return [Enumerator]
+        #
+        # @example
+        #   array_enumerator(['build', 'enumerator', 'from', 'any', 'array'], cursor: cursor)
+        #
+        def array_enumerator(array, cursor:)
+          raise ArgumentError, "array must be an Array" unless array.is_a?(Array)
+
+          x = array.each_with_index.drop(cursor || 0)
+          x.to_enum { x.size }
+        end
+
+        # Builds Enumerator from `ActiveRecord::Relation`.
+        # Each Enumerator tick moves the cursor one row forward.
+        #
+        # @param relation [ActiveRecord::Relation] relation to iterate
+        # @param cursor [Object] offset id to start iteration from
+        # @param options [Hash] additional options that will be passed to relevant
+        #   ActiveRecord batching methods
+        #
+        # @return [ActiveRecordEnumerator]
+        #
+        # @example
+        #   def build_enumerator(cursor:)
+        #     active_record_records_enumerator(User.all, cursor: cursor)
+        #   end
+        #
+        #   def each_iteration(user)
+        #     user.notify_about_something
+        #   end
+        #
+        def active_record_records_enumerator(relation, cursor:, **options)
+          ActiveRecordEnumerator.new(relation, cursor: cursor, **options).records
+        end
+
+        # Builds Enumerator from `ActiveRecord::Relation` and enumerates on batches of records.
+        # Each Enumerator tick moves the cursor `:batch_size` rows forward.
+        # @see #active_record_records_enumerator
+        #
+        # @example
+        #   def build_enumerator(product_id, cursor:)
+        #     active_record_batches_enumerator(
+        #       Comment.where(product_id: product_id).select(:id),
+        #       cursor: cursor,
+        #       batch_size: 100
+        #     )
+        #   end
+        #
+        #   def each_iteration(batch_of_comments, product_id)
+        #     comment_ids = batch_of_comments.map(&:id)
+        #     CommentService.call(comment_ids: comment_ids)
+        #   end
+        #
+        def active_record_batches_enumerator(relation, cursor:, **options)
+          ActiveRecordEnumerator.new(relation, cursor: cursor, **options).batches
+        end
+
+        # Builds Enumerator from `ActiveRecord::Relation` and enumerates on batches,
+        # yielding `ActiveRecord::Relation`s.
+        # @see #active_record_records_enumerator
+        #
+        # @example
+        #   def build_enumerator(product_id, cursor:)
+        #     active_record_relations_enumerator(
+        #       Product.find(product_id).comments,
+        #       cursor: cursor,
+        #       batch_size: 100,
+        #     )
+        #   end
+        #
+        #   def each_iteration(batch_of_comments, product_id)
+        #     # batch_of_comments will be a Comment::ActiveRecord_Relation
+        #     batch_of_comments.update_all(deleted: true)
+        #   end
+        #
+        def active_record_relations_enumerator(relation, cursor:, **options)
+          ActiveRecordEnumerator.new(relation, cursor: cursor, **options).relations
+        end
+
+        # Builds Enumerator from a CSV file.
+        #
+        # @param csv [CSV] an instance of CSV object
+        # @param cursor [Integer] offset to start iteration from
+        #
+        # @example
+        #   def build_enumerator(import_id, cursor:)
+        #     import = Import.find(import_id)
+        #     csv_enumerator(import.csv, cursor: cursor)
+        #   end
+        #
+        #   def each_iteration(csv_row)
+        #     # insert csv_row into database
+        #   end
+        #
+        def csv_enumerator(csv, cursor:)
+          CsvEnumerator.new(csv).rows(cursor: cursor)
+        end
+
+        # Builds Enumerator from a CSV file and enumerates on batches of records.
+        #
+        # @param csv [CSV] an instance of CSV object
+        # @param cursor [Integer] offset to start iteration from
+        # @option options :batch_size [Integer] (100) size of the batch
+        #
+        # @example
+        #   def build_enumerator(import_id, cursor:)
+        #     import = Import.find(import_id)
+        #     csv_batches_enumerator(import.csv, cursor: cursor)
+        #   end
+        #
+        #   def each_iteration(batch_of_csv_rows)
+        #     # ...
+        #   end
+        #
+        def csv_batches_enumerator(csv, cursor:, **options)
+          CsvEnumerator.new(csv).batches(cursor: cursor, **options)
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/gems/sidekiq-7.2.4/lib/sidekiq/job_logger.rb b/vendor/gems/sidekiq/lib/sidekiq/job_logger.rb
similarity index 58%
rename from vendor/gems/sidekiq-7.2.4/lib/sidekiq/job_logger.rb
rename to vendor/gems/sidekiq/lib/sidekiq/job_logger.rb
index 185737b73f7..726c0762ace 100644
--- a/vendor/gems/sidekiq-7.2.4/lib/sidekiq/job_logger.rb
+++ b/vendor/gems/sidekiq/lib/sidekiq/job_logger.rb
@@ -2,23 +2,34 @@
 
 module Sidekiq
   class JobLogger
-    def initialize(logger)
-      @logger = logger
+    def initialize(config)
+      @config = config
+      @logger = @config.logger
+    end
+
+    # If true we won't do any job logging out of the box.
+    # The user is responsible for any logging.
+    def skip_default_logging?
+      @config[:skip_default_job_logging]
     end
 
     def call(item, queue)
-      start = ::Process.clock_gettime(::Process::CLOCK_MONOTONIC)
-      @logger.info("start")
+      return yield if skip_default_logging?
 
-      yield
+      begin
+        start = ::Process.clock_gettime(::Process::CLOCK_MONOTONIC)
+        @logger.info("start")
 
-      Sidekiq::Context.add(:elapsed, elapsed(start))
-      @logger.info("done")
-    rescue Exception
-      Sidekiq::Context.add(:elapsed, elapsed(start))
-      @logger.info("fail")
+        yield
 
-      raise
+        Sidekiq::Context.add(:elapsed, elapsed(start))
+        @logger.info("done")
+      rescue Exception
+        Sidekiq::Context.add(:elapsed, elapsed(start))
+        @logger.info("fail")
+
+        raise
+      end
     end
 
     def prepare(job_hash, &block)
diff --git a/vendor/gems/sidekiq-7.2.4/lib/sidekiq/job_retry.rb b/vendor/gems/sidekiq/lib/sidekiq/job_retry.rb
similarity index 97%
rename from vendor/gems/sidekiq-7.2.4/lib/sidekiq/job_retry.rb
rename to vendor/gems/sidekiq/lib/sidekiq/job_retry.rb
index 923874fdc35..e5acc60c36f 100644
--- a/vendor/gems/sidekiq-7.2.4/lib/sidekiq/job_retry.rb
+++ b/vendor/gems/sidekiq/lib/sidekiq/job_retry.rb
@@ -59,8 +59,13 @@ module Sidekiq
   #    end
   #
   class JobRetry
+    # Handled means the job failed but has been dealt with
+    # (by creating a retry, rescheduling it, etc). It still
+    # needs to be logged and dispatched to error_handlers.
     class Handled < ::RuntimeError; end
 
+    # Skip means the job failed but Sidekiq does not need to
+    # create a retry, log it or send to error_handlers.
     class Skip < Handled; end
 
     include Sidekiq::Component
@@ -129,7 +134,7 @@ module Sidekiq
       process_retry(jobinst, msg, queue, e)
       # We've handled this error associated with this job, don't
       # need to handle it at the global level
-      raise Skip
+      raise Handled
     end
 
     private
diff --git a/vendor/gems/sidekiq-7.2.4/lib/sidekiq/job_util.rb b/vendor/gems/sidekiq/lib/sidekiq/job_util.rb
similarity index 99%
rename from vendor/gems/sidekiq-7.2.4/lib/sidekiq/job_util.rb
rename to vendor/gems/sidekiq/lib/sidekiq/job_util.rb
index 30ed91f81e3..cff0f3867c6 100644
--- a/vendor/gems/sidekiq-7.2.4/lib/sidekiq/job_util.rb
+++ b/vendor/gems/sidekiq/lib/sidekiq/job_util.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "securerandom"
 require "time"
 
diff --git a/vendor/gems/sidekiq-7.2.4/lib/sidekiq/launcher.rb b/vendor/gems/sidekiq/lib/sidekiq/launcher.rb
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/lib/sidekiq/launcher.rb
rename to vendor/gems/sidekiq/lib/sidekiq/launcher.rb
diff --git a/vendor/gems/sidekiq-7.2.4/lib/sidekiq/logger.rb b/vendor/gems/sidekiq/lib/sidekiq/logger.rb
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/lib/sidekiq/logger.rb
rename to vendor/gems/sidekiq/lib/sidekiq/logger.rb
diff --git a/vendor/gems/sidekiq-7.2.4/lib/sidekiq/manager.rb b/vendor/gems/sidekiq/lib/sidekiq/manager.rb
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/lib/sidekiq/manager.rb
rename to vendor/gems/sidekiq/lib/sidekiq/manager.rb
diff --git a/vendor/gems/sidekiq-7.2.4/lib/sidekiq/metrics/query.rb b/vendor/gems/sidekiq/lib/sidekiq/metrics/query.rb
similarity index 99%
rename from vendor/gems/sidekiq-7.2.4/lib/sidekiq/metrics/query.rb
rename to vendor/gems/sidekiq/lib/sidekiq/metrics/query.rb
index a357c8dbc62..21ddb739625 100644
--- a/vendor/gems/sidekiq-7.2.4/lib/sidekiq/metrics/query.rb
+++ b/vendor/gems/sidekiq/lib/sidekiq/metrics/query.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "sidekiq"
 require "date"
 require "set"
diff --git a/vendor/gems/sidekiq-7.2.4/lib/sidekiq/metrics/shared.rb b/vendor/gems/sidekiq/lib/sidekiq/metrics/shared.rb
similarity index 99%
rename from vendor/gems/sidekiq-7.2.4/lib/sidekiq/metrics/shared.rb
rename to vendor/gems/sidekiq/lib/sidekiq/metrics/shared.rb
index c57e73061f4..e2a4b1462cb 100644
--- a/vendor/gems/sidekiq-7.2.4/lib/sidekiq/metrics/shared.rb
+++ b/vendor/gems/sidekiq/lib/sidekiq/metrics/shared.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "concurrent"
 
 module Sidekiq
diff --git a/vendor/gems/sidekiq-7.2.4/lib/sidekiq/metrics/tracking.rb b/vendor/gems/sidekiq/lib/sidekiq/metrics/tracking.rb
similarity index 90%
rename from vendor/gems/sidekiq-7.2.4/lib/sidekiq/metrics/tracking.rb
rename to vendor/gems/sidekiq/lib/sidekiq/metrics/tracking.rb
index c48dd8bcdfb..068aab3d8bd 100644
--- a/vendor/gems/sidekiq-7.2.4/lib/sidekiq/metrics/tracking.rb
+++ b/vendor/gems/sidekiq/lib/sidekiq/metrics/tracking.rb
@@ -31,11 +31,11 @@ module Sidekiq
           # We don't track time for failed jobs as they can have very unpredictable
           # execution times. more important to know average time for successful jobs so we
           # can better recognize when a perf regression is introduced.
-          @lock.synchronize {
-            @grams[klass].record_time(time_ms)
-            @jobs["#{klass}|ms"] += time_ms
-            @totals["ms"] += time_ms
-          }
+          track_time(klass, time_ms)
+        rescue JobRetry::Skip
+          # This is raised when iterable job is interrupted.
+          track_time(klass, time_ms)
+          raise
         rescue Exception
           @lock.synchronize {
             @jobs["#{klass}|f"] += 1
@@ -100,6 +100,14 @@ module Sidekiq
 
       private
 
+      def track_time(klass, time_ms)
+        @lock.synchronize {
+          @grams[klass].record_time(time_ms)
+          @jobs["#{klass}|ms"] += time_ms
+          @totals["ms"] += time_ms
+        }
+      end
+
       def reset
         @lock.synchronize {
           array = [@totals, @jobs, @grams]
diff --git a/vendor/gems/sidekiq-7.2.4/lib/sidekiq/middleware/chain.rb b/vendor/gems/sidekiq/lib/sidekiq/middleware/chain.rb
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/lib/sidekiq/middleware/chain.rb
rename to vendor/gems/sidekiq/lib/sidekiq/middleware/chain.rb
diff --git a/vendor/gems/sidekiq-7.2.4/lib/sidekiq/middleware/current_attributes.rb b/vendor/gems/sidekiq/lib/sidekiq/middleware/current_attributes.rb
similarity index 74%
rename from vendor/gems/sidekiq-7.2.4/lib/sidekiq/middleware/current_attributes.rb
rename to vendor/gems/sidekiq/lib/sidekiq/middleware/current_attributes.rb
index 80cbe9590ec..40cf8c9d439 100644
--- a/vendor/gems/sidekiq-7.2.4/lib/sidekiq/middleware/current_attributes.rb
+++ b/vendor/gems/sidekiq/lib/sidekiq/middleware/current_attributes.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "active_support/current_attributes"
 
 module Sidekiq
@@ -46,22 +48,38 @@ module Sidekiq
       end
 
       def call(_, job, _, &block)
-        cattrs_to_reset = []
+        klass_attrs = {}
 
         @cattrs.each do |(key, strklass)|
-          if job.has_key?(key)
-            constklass = strklass.constantize
-            cattrs_to_reset << constklass
+          next unless job.has_key?(key)
 
-            job[key].each do |(attribute, value)|
-              constklass.public_send(:"#{attribute}=", value)
-            end
-          end
+          klass_attrs[strklass.constantize] = job[key]
         end
 
-        yield
-      ensure
-        cattrs_to_reset.each(&:reset)
+        wrap(klass_attrs.to_a, &block)
+      end
+
+      private
+
+      def wrap(klass_attrs, &block)
+        klass, attrs = klass_attrs.shift
+        return block.call unless klass
+
+        retried = false
+
+        begin
+          klass.set(attrs) do
+            wrap(klass_attrs, &block)
+          end
+        rescue NoMethodError
+          raise if retried
+
+          # It is possible that the `CurrentAttributes` definition
+          # was changed before the job started processing.
+          attrs = attrs.select { |attr| klass.respond_to?(attr) }
+          retried = true
+          retry
+        end
       end
     end
 
diff --git a/vendor/gems/sidekiq-7.2.4/lib/sidekiq/middleware/i18n.rb b/vendor/gems/sidekiq/lib/sidekiq/middleware/i18n.rb
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/lib/sidekiq/middleware/i18n.rb
rename to vendor/gems/sidekiq/lib/sidekiq/middleware/i18n.rb
diff --git a/vendor/gems/sidekiq-7.2.4/lib/sidekiq/middleware/modules.rb b/vendor/gems/sidekiq/lib/sidekiq/middleware/modules.rb
similarity index 92%
rename from vendor/gems/sidekiq-7.2.4/lib/sidekiq/middleware/modules.rb
rename to vendor/gems/sidekiq/lib/sidekiq/middleware/modules.rb
index 5320bff3659..5bacc8fde44 100644
--- a/vendor/gems/sidekiq-7.2.4/lib/sidekiq/middleware/modules.rb
+++ b/vendor/gems/sidekiq/lib/sidekiq/middleware/modules.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Sidekiq
   # Server-side middleware must import this Module in order
   # to get access to server resources during `call`.
diff --git a/vendor/gems/sidekiq-7.2.4/lib/sidekiq/monitor.rb b/vendor/gems/sidekiq/lib/sidekiq/monitor.rb
similarity index 98%
rename from vendor/gems/sidekiq-7.2.4/lib/sidekiq/monitor.rb
rename to vendor/gems/sidekiq/lib/sidekiq/monitor.rb
index 54f00b70d1b..5434581984b 100644
--- a/vendor/gems/sidekiq-7.2.4/lib/sidekiq/monitor.rb
+++ b/vendor/gems/sidekiq/lib/sidekiq/monitor.rb
@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require "fileutils"
 require "sidekiq/api"
@@ -98,7 +99,7 @@ class Sidekiq::Monitor
       pad = opts[:pad] || 0
       max_length = opts[:max_length] || (80 - pad)
       out = []
-      line = ""
+      line = +""
       values.each do |value|
         if (line.length + value.length) > max_length
           out << line
diff --git a/vendor/gems/sidekiq-7.2.4/lib/sidekiq/paginator.rb b/vendor/gems/sidekiq/lib/sidekiq/paginator.rb
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/lib/sidekiq/paginator.rb
rename to vendor/gems/sidekiq/lib/sidekiq/paginator.rb
diff --git a/vendor/gems/sidekiq-7.2.4/lib/sidekiq/processor.rb b/vendor/gems/sidekiq/lib/sidekiq/processor.rb
similarity index 96%
rename from vendor/gems/sidekiq-7.2.4/lib/sidekiq/processor.rb
rename to vendor/gems/sidekiq/lib/sidekiq/processor.rb
index 764fd66def1..ef0e814575e 100644
--- a/vendor/gems/sidekiq-7.2.4/lib/sidekiq/processor.rb
+++ b/vendor/gems/sidekiq/lib/sidekiq/processor.rb
@@ -36,7 +36,7 @@ module Sidekiq
       @job = nil
       @thread = nil
       @reloader = Sidekiq.default_configuration[:reloader]
-      @job_logger = (capsule.config[:job_logger] || Sidekiq::JobLogger).new(logger)
+      @job_logger = (capsule.config[:job_logger] || Sidekiq::JobLogger).new(capsule.config)
       @retrier = Sidekiq::JobRetry.new(capsule)
     end
 
@@ -58,6 +58,10 @@ module Sidekiq
       @thread.value if wait
     end
 
+    def stopping?
+      @done
+    end
+
     def start
       @thread ||= safe_thread("#{config.name}/processor", &method(:run))
     end
@@ -136,6 +140,7 @@ module Sidekiq
                 klass = Object.const_get(job_hash["class"])
                 inst = klass.new
                 inst.jid = job_hash["jid"]
+                inst._context = self
                 @retrier.local(inst, jobstr, queue) do
                   yield inst
                 end
@@ -185,6 +190,11 @@ module Sidekiq
           # Had to force kill this job because it didn't finish
           # within the timeout.  Don't acknowledge the work since
           # we didn't properly finish it.
+        rescue Sidekiq::JobRetry::Skip => s
+          # Skip means we handled this error elsewhere. We don't
+          # need to log or report the error.
+          ack = true
+          raise s
         rescue Sidekiq::JobRetry::Handled => h
           # this is the common case: job raised error and Sidekiq::JobRetry::Handled
           # signals that we created a retry successfully.  We can acknowledge the job.
diff --git a/vendor/gems/sidekiq-7.2.4/lib/sidekiq/rails.rb b/vendor/gems/sidekiq/lib/sidekiq/rails.rb
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/lib/sidekiq/rails.rb
rename to vendor/gems/sidekiq/lib/sidekiq/rails.rb
diff --git a/vendor/gems/sidekiq-7.2.4/lib/sidekiq/redis_client_adapter.rb b/vendor/gems/sidekiq/lib/sidekiq/redis_client_adapter.rb
similarity index 88%
rename from vendor/gems/sidekiq-7.2.4/lib/sidekiq/redis_client_adapter.rb
rename to vendor/gems/sidekiq/lib/sidekiq/redis_client_adapter.rb
index ea4f35c51ff..222790e1cbc 100644
--- a/vendor/gems/sidekiq-7.2.4/lib/sidekiq/redis_client_adapter.rb
+++ b/vendor/gems/sidekiq/lib/sidekiq/redis_client_adapter.rb
@@ -64,6 +64,13 @@ module Sidekiq
       opts = client_opts(options)
       @config = if opts.key?(:sentinels)
         RedisClient.sentinel(**opts)
+      elsif opts.key?(:nodes)
+        # Sidekiq does not support Redis clustering but Sidekiq Enterprise's
+        # rate limiters are cluster-safe so we can scale to millions
+        # of rate limiters using a Redis cluster. This requires the
+        # `redis-cluster-client` gem.
+        # Sidekiq::Limiter.redis = { nodes: [...] }
+        RedisClient.cluster(**opts)
       else
         RedisClient.config(**opts)
       end
@@ -90,13 +97,9 @@ module Sidekiq
         opts.delete(:network_timeout)
       end
 
-      if opts[:driver]
-        opts[:driver] = opts[:driver].to_sym
-      end
-
       opts[:name] = opts.delete(:master_name) if opts.key?(:master_name)
       opts[:role] = opts[:role].to_sym if opts.key?(:role)
-      opts.delete(:url) if opts.key?(:sentinels)
+      opts[:driver] = opts[:driver].to_sym if opts.key?(:driver)
 
       # Issue #3303, redis-rb will silently retry an operation.
       # This can lead to duplicate jobs if Sidekiq::Client's LPUSH
diff --git a/vendor/gems/sidekiq-7.2.4/lib/sidekiq/redis_connection.rb b/vendor/gems/sidekiq/lib/sidekiq/redis_connection.rb
similarity index 67%
rename from vendor/gems/sidekiq-7.2.4/lib/sidekiq/redis_connection.rb
rename to vendor/gems/sidekiq/lib/sidekiq/redis_connection.rb
index 0433324fc0c..8f439045099 100644
--- a/vendor/gems/sidekiq-7.2.4/lib/sidekiq/redis_connection.rb
+++ b/vendor/gems/sidekiq/lib/sidekiq/redis_connection.rb
@@ -8,17 +8,28 @@ module Sidekiq
   module RedisConnection
     class << self
       def create(options = {})
-        symbolized_options = options.transform_keys(&:to_sym)
+        symbolized_options = deep_symbolize_keys(options)
         symbolized_options[:url] ||= determine_redis_provider
 
         logger = symbolized_options.delete(:logger)
         logger&.info { "Sidekiq #{Sidekiq::VERSION} connecting to Redis with options #{scrub(symbolized_options)}" }
 
         raise "Sidekiq 7+ does not support Redis protocol 2" if symbolized_options[:protocol] == 2
+
+        safe = !!symbolized_options.delete(:cluster_safe)
+        raise ":nodes not allowed, Sidekiq is not safe to run on Redis Cluster" if !safe && symbolized_options.key?(:nodes)
+
         size = symbolized_options.delete(:size) || 5
         pool_timeout = symbolized_options.delete(:pool_timeout) || 1
         pool_name = symbolized_options.delete(:pool_name)
 
+        # Default timeout in redis-client is 1 second, which can be too aggressive
+        # if the Sidekiq process is CPU-bound. With 10-15 threads and a thread quantum of 100ms,
+        # it can be easy to get the occasional ReadTimeoutError. You can still provide
+        # a smaller timeout explicitly:
+        #     config.redis = { url: "...", timeout: 1 }
+        symbolized_options[:timeout] ||= 3
+
         redis_config = Sidekiq::RedisClientAdapter.new(symbolized_options)
         ConnectionPool.new(timeout: pool_timeout, size: size, name: pool_name) do
           redis_config.new_client
@@ -27,6 +38,19 @@ module Sidekiq
 
       private
 
+      def deep_symbolize_keys(object)
+        case object
+        when Hash
+          object.each_with_object({}) do |(key, value), result|
+            result[key.to_sym] = deep_symbolize_keys(value)
+          end
+        when Array
+          object.map { |e| deep_symbolize_keys(e) }
+        else
+          object
+        end
+      end
+
       def scrub(options)
         redacted = "REDACTED"
 
@@ -42,7 +66,14 @@ module Sidekiq
         scrubbed_options[:password] = redacted if scrubbed_options[:password]
         scrubbed_options[:sentinel_password] = redacted if scrubbed_options[:sentinel_password]
         scrubbed_options[:sentinels]&.each do |sentinel|
-          sentinel[:password] = redacted if sentinel[:password]
+          if sentinel.is_a?(String)
+            if (uri = URI(sentinel)) && uri.password
+              uri.password = redacted
+              sentinel.replace(uri.to_s)
+            end
+          elsif sentinel[:password]
+            sentinel[:password] = redacted
+          end
         end
         scrubbed_options
       end
diff --git a/vendor/gems/sidekiq-7.2.4/lib/sidekiq/ring_buffer.rb b/vendor/gems/sidekiq/lib/sidekiq/ring_buffer.rb
similarity index 93%
rename from vendor/gems/sidekiq-7.2.4/lib/sidekiq/ring_buffer.rb
rename to vendor/gems/sidekiq/lib/sidekiq/ring_buffer.rb
index ee03a72b0a7..404921b0ebf 100644
--- a/vendor/gems/sidekiq-7.2.4/lib/sidekiq/ring_buffer.rb
+++ b/vendor/gems/sidekiq/lib/sidekiq/ring_buffer.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "forwardable"
 
 module Sidekiq
diff --git a/vendor/gems/sidekiq-7.2.4/lib/sidekiq/scheduled.rb b/vendor/gems/sidekiq/lib/sidekiq/scheduled.rb
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/lib/sidekiq/scheduled.rb
rename to vendor/gems/sidekiq/lib/sidekiq/scheduled.rb
diff --git a/vendor/gems/sidekiq-7.2.4/lib/sidekiq/sd_notify.rb b/vendor/gems/sidekiq/lib/sidekiq/sd_notify.rb
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/lib/sidekiq/sd_notify.rb
rename to vendor/gems/sidekiq/lib/sidekiq/sd_notify.rb
diff --git a/vendor/gems/sidekiq-7.2.4/lib/sidekiq/systemd.rb b/vendor/gems/sidekiq/lib/sidekiq/systemd.rb
similarity index 96%
rename from vendor/gems/sidekiq-7.2.4/lib/sidekiq/systemd.rb
rename to vendor/gems/sidekiq/lib/sidekiq/systemd.rb
index 7e6472f521f..8db0687d4e5 100644
--- a/vendor/gems/sidekiq-7.2.4/lib/sidekiq/systemd.rb
+++ b/vendor/gems/sidekiq/lib/sidekiq/systemd.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #
 # Sidekiq's systemd integration allows Sidekiq to inform systemd:
 #  1. when it has successfully started
diff --git a/vendor/gems/sidekiq-7.2.4/lib/sidekiq/testing.rb b/vendor/gems/sidekiq/lib/sidekiq/testing.rb
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/lib/sidekiq/testing.rb
rename to vendor/gems/sidekiq/lib/sidekiq/testing.rb
diff --git a/vendor/gems/sidekiq-7.2.4/lib/sidekiq/testing/inline.rb b/vendor/gems/sidekiq/lib/sidekiq/testing/inline.rb
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/lib/sidekiq/testing/inline.rb
rename to vendor/gems/sidekiq/lib/sidekiq/testing/inline.rb
diff --git a/vendor/gems/sidekiq-7.2.4/lib/sidekiq/transaction_aware_client.rb b/vendor/gems/sidekiq/lib/sidekiq/transaction_aware_client.rb
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/lib/sidekiq/transaction_aware_client.rb
rename to vendor/gems/sidekiq/lib/sidekiq/transaction_aware_client.rb
diff --git a/vendor/gems/sidekiq-7.2.4/lib/sidekiq/version.rb b/vendor/gems/sidekiq/lib/sidekiq/version.rb
similarity index 75%
rename from vendor/gems/sidekiq-7.2.4/lib/sidekiq/version.rb
rename to vendor/gems/sidekiq/lib/sidekiq/version.rb
index e93ed589d7e..44bf3b95ca7 100644
--- a/vendor/gems/sidekiq-7.2.4/lib/sidekiq/version.rb
+++ b/vendor/gems/sidekiq/lib/sidekiq/version.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module Sidekiq
-  VERSION = "7.2.4"
+  VERSION = "7.3.1"
   MAJOR = 7
 end
diff --git a/vendor/gems/sidekiq-7.2.4/lib/sidekiq/web.rb b/vendor/gems/sidekiq/lib/sidekiq/web.rb
similarity index 61%
rename from vendor/gems/sidekiq-7.2.4/lib/sidekiq/web.rb
rename to vendor/gems/sidekiq/lib/sidekiq/web.rb
index cd9d609442f..c30a6f9bd46 100644
--- a/vendor/gems/sidekiq-7.2.4/lib/sidekiq/web.rb
+++ b/vendor/gems/sidekiq/lib/sidekiq/web.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "erb"
+require "securerandom"
 
 require "sidekiq"
 require "sidekiq/api"
@@ -39,11 +40,13 @@ module Sidekiq
       CONTENT_SECURITY_POLICY = "Content-Security-Policy"
       LOCATION = "Location"
       X_CASCADE = "X-Cascade"
+      X_CONTENT_TYPE_OPTIONS = "X-Content-Type-Options"
     else
       CONTENT_LANGUAGE = "content-language"
       CONTENT_SECURITY_POLICY = "content-security-policy"
       LOCATION = "location"
       X_CASCADE = "x-cascade"
+      X_CONTENT_TYPE_OPTIONS = "x-content-type-options"
     end
 
     class << self
@@ -114,6 +117,7 @@ module Sidekiq
     end
 
     def call(env)
+      env[:csp_nonce] = SecureRandom.base64(16)
       app.call(env)
     end
 
@@ -138,7 +142,50 @@ module Sidekiq
       send(:"#{attribute}=", value)
     end
 
-    def self.register(extension)
+    # Register a class as a Sidekiq Web UI extension. The class should
+    # provide one or more tabs which map to an index route. Options:
+    #
+    # @param extension [Class] Class which contains the HTTP actions, required
+    # @param name [String] the name of the extension, used to namespace assets
+    # @param tab [String | Array] labels(s) of the UI tabs
+    # @param index [String | Array] index route(s) for each tab
+    # @param root_dir [String] directory location to find assets, locales and views, typically `web/` within the gemfile
+    # @param asset_paths [Array] one or more directories under {root}/assets/{name} to be publicly served, e.g. ["js", "css", "img"]
+    # @param cache_for [Integer] amount of time to cache assets, default one day
+    #
+    # TODO name, tab and index will be mandatory in 8.0
+    #
+    # Web extensions will have a root `web/` directory with `locales/`, `assets/`
+    # and `views/` subdirectories.
+    def self.register(extension, name: nil, tab: nil, index: nil, root_dir: nil, cache_for: 86400, asset_paths: nil)
+      tab = Array(tab)
+      index = Array(index)
+      tab.zip(index).each do |tab, index|
+        tabs[tab] = index
+      end
+      if root_dir
+        locdir = File.join(root_dir, "locales")
+        locales << locdir if File.directory?(locdir)
+
+        if asset_paths && name
+          # if you have {root}/assets/{name}/js/scripts.js
+          # and {root}/assets/{name}/css/styles.css
+          # you would pass in:
+          #   asset_paths: ["js", "css"]
+          # See script_tag and style_tag in web/helpers.rb
+          assdir = File.join(root_dir, "assets")
+          assurls = Array(asset_paths).map { |x| "/#{name}/#{x}" }
+          assetprops = {
+            urls: assurls,
+            root: assdir,
+            cascade: true
+          }
+          assetprops[:header_rules] = [[:all, {Rack::CACHE_CONTROL => "private, max-age=#{cache_for.to_i}"}]] if cache_for
+          middlewares << [[Rack::Static, assetprops], nil]
+        end
+      end
+
+      yield self if block_given?
       extension.registered(WebApplication)
     end
 
diff --git a/vendor/gems/sidekiq-7.2.4/lib/sidekiq/web/action.rb b/vendor/gems/sidekiq/lib/sidekiq/web/action.rb
similarity index 94%
rename from vendor/gems/sidekiq-7.2.4/lib/sidekiq/web/action.rb
rename to vendor/gems/sidekiq/lib/sidekiq/web/action.rb
index 05dc4a88e23..8f92d035b66 100644
--- a/vendor/gems/sidekiq-7.2.4/lib/sidekiq/web/action.rb
+++ b/vendor/gems/sidekiq/lib/sidekiq/web/action.rb
@@ -47,7 +47,8 @@ module Sidekiq
     def erb(content, options = {})
       if content.is_a? Symbol
         unless respond_to?(:"_erb_#{content}")
-          src = ERB.new(File.read("#{Web.settings.views}/#{content}.erb")).src
+          views = options[:views] || Web.settings.views
+          src = ERB.new(File.read("#{views}/#{content}.erb")).src
           WebAction.class_eval <<-RUBY, __FILE__, __LINE__ + 1
             def _erb_#{content}
               #{src}
diff --git a/vendor/gems/sidekiq-7.2.4/lib/sidekiq/web/application.rb b/vendor/gems/sidekiq/lib/sidekiq/web/application.rb
similarity index 96%
rename from vendor/gems/sidekiq-7.2.4/lib/sidekiq/web/application.rb
rename to vendor/gems/sidekiq/lib/sidekiq/web/application.rb
index 7d925164d95..1fb89053454 100644
--- a/vendor/gems/sidekiq-7.2.4/lib/sidekiq/web/application.rb
+++ b/vendor/gems/sidekiq/lib/sidekiq/web/application.rb
@@ -5,7 +5,7 @@ module Sidekiq
     extend WebRouter
 
     REDIS_KEYS = %w[redis_version uptime_in_days connected_clients used_memory_human used_memory_peak_human]
-    CSP_HEADER = [
+    CSP_HEADER_TEMPLATE = [
       "default-src 'self' https: http:",
       "child-src 'self'",
       "connect-src 'self' https: http: wss: ws:",
@@ -15,8 +15,8 @@ module Sidekiq
       "manifest-src 'self'",
       "media-src 'self'",
       "object-src 'none'",
-      "script-src 'self' https: http:",
-      "style-src 'self' https: http: 'unsafe-inline'",
+      "script-src 'self' 'nonce-!placeholder!'",
+      "style-src 'self' https: http: 'unsafe-inline'", # TODO Nonce in 8.0
       "worker-src 'self'",
       "base-uri 'self'"
     ].join("; ").freeze
@@ -428,13 +428,18 @@ module Sidekiq
           Rack::CONTENT_TYPE => "text/html",
           Rack::CACHE_CONTROL => "private, no-store",
           Web::CONTENT_LANGUAGE => action.locale,
-          Web::CONTENT_SECURITY_POLICY => CSP_HEADER
+          Web::CONTENT_SECURITY_POLICY => process_csp(env, CSP_HEADER_TEMPLATE),
+          Web::X_CONTENT_TYPE_OPTIONS => "nosniff"
         }
         # we'll let Rack calculate Content-Length for us.
         [200, headers, [resp]]
       end
     end
 
+    def process_csp(env, input)
+      input.gsub("!placeholder!", env[:csp_nonce])
+    end
+
     def self.helpers(mod = nil, &block)
       if block
         WebAction.class_eval(&block)
diff --git a/vendor/gems/sidekiq-7.2.4/lib/sidekiq/web/csrf_protection.rb b/vendor/gems/sidekiq/lib/sidekiq/web/csrf_protection.rb
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/lib/sidekiq/web/csrf_protection.rb
rename to vendor/gems/sidekiq/lib/sidekiq/web/csrf_protection.rb
diff --git a/vendor/gems/sidekiq-7.2.4/lib/sidekiq/web/helpers.rb b/vendor/gems/sidekiq/lib/sidekiq/web/helpers.rb
similarity index 86%
rename from vendor/gems/sidekiq-7.2.4/lib/sidekiq/web/helpers.rb
rename to vendor/gems/sidekiq/lib/sidekiq/web/helpers.rb
index b7626500ea2..7ecae2a2450 100644
--- a/vendor/gems/sidekiq-7.2.4/lib/sidekiq/web/helpers.rb
+++ b/vendor/gems/sidekiq/lib/sidekiq/web/helpers.rb
@@ -6,8 +6,51 @@ require "yaml"
 require "cgi"
 
 module Sidekiq
-  # This is not a public API
+  # These methods are available to pages within the Web UI and UI extensions.
+  # They are not public APIs for applications to use.
   module WebHelpers
+    def style_tag(location, **kwargs)
+      global = location.match?(/:\/\//)
+      location = root_path + location if !global && !location.start_with?(root_path)
+      attrs = {
+        type: "text/css",
+        media: "screen",
+        rel: "stylesheet",
+        nonce: csp_nonce,
+        href: location
+      }
+      html_tag(:link, attrs.merge(kwargs))
+    end
+
+    def script_tag(location, **kwargs)
+      global = location.match?(/:\/\//)
+      location = root_path + location if !global && !location.start_with?(root_path)
+      attrs = {
+        type: "text/javascript",
+        nonce: csp_nonce,
+        src: location
+      }
+      html_tag(:script, attrs.merge(kwargs)) {}
+    end
+
+    # NB: keys and values are not escaped; do not allow user input
+    # in the attributes
+    private def html_tag(tagname, attrs)
+      s = +"<#{tagname}"
+      attrs.each_pair do |k, v|
+        next unless v
+        s << " #{k}=\"#{v}\""
+      end
+      if block_given?
+        s << ">"
+        yield s
+        s << "</#{tagname}>"
+      else
+        s << " />"
+      end
+      s
+    end
+
     def strings(lang)
       @strings ||= {}
 
@@ -46,7 +89,7 @@ module Sidekiq
     end
 
     def available_locales
-      @available_locales ||= locale_files.map { |path| File.basename(path, ".yml") }.uniq
+      @available_locales ||= Set.new(locale_files.map { |path| File.basename(path, ".yml") })
     end
 
     def find_locale_files(lang)
@@ -122,10 +165,9 @@ module Sidekiq
     # Inspiration taken from https://github.com/iain/http_accept_language/blob/master/lib/http_accept_language/parser.rb
     def locale
       # session[:locale] is set via the locale selector from the footer
-      # defined?(session) && session are used to avoid exceptions when running tests
-      return session[:locale] if defined?(session) && session&.[](:locale)
-
-      @locale ||= begin
+      @locale ||= if (l = session&.fetch(:locale, nil)) && available_locales.include?(l)
+        l
+      else
         matched_locale = user_preferred_languages.map { |preferred|
           preferred_language = preferred.split("-", 2).first
 
@@ -267,6 +309,10 @@ module Sidekiq
       "<input type='hidden' name='authenticity_token' value='#{env[:csrf_token]}'/>"
     end
 
+    def csp_nonce
+      env[:csp_nonce]
+    end
+
     def to_display(arg)
       arg.inspect
     rescue
@@ -310,7 +356,7 @@ module Sidekiq
     end
 
     def h(text)
-      ::Rack::Utils.escape_html(text)
+      ::Rack::Utils.escape_html(text.to_s)
     rescue ArgumentError => e
       raise unless e.message.eql?("invalid byte sequence in UTF-8")
       text.encode!("UTF-16", "UTF-8", invalid: :replace, replace: "").encode!("UTF-8", "UTF-16")
diff --git a/vendor/gems/sidekiq-7.2.4/lib/sidekiq/web/router.rb b/vendor/gems/sidekiq/lib/sidekiq/web/router.rb
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/lib/sidekiq/web/router.rb
rename to vendor/gems/sidekiq/lib/sidekiq/web/router.rb
diff --git a/vendor/gems/sidekiq-7.2.4/lib/sidekiq/worker_compatibility_alias.rb b/vendor/gems/sidekiq/lib/sidekiq/worker_compatibility_alias.rb
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/lib/sidekiq/worker_compatibility_alias.rb
rename to vendor/gems/sidekiq/lib/sidekiq/worker_compatibility_alias.rb
diff --git a/vendor/gems/sidekiq/patches/0001-Update-zrange-calls-to-be-Redis-6.0-compatible.patch b/vendor/gems/sidekiq/patches/0001-Update-zrange-calls-to-be-Redis-6.0-compatible.patch
new file mode 100644
index 00000000000..6e8d255790e
--- /dev/null
+++ b/vendor/gems/sidekiq/patches/0001-Update-zrange-calls-to-be-Redis-6.0-compatible.patch
@@ -0,0 +1,103 @@
+From 60542e46e14af0f2304a8735164037d2b1dd025c Mon Sep 17 00:00:00 2001
+Message-ID: <60542e46e14af0f2304a8735164037d2b1dd025c.1724993234.git.stanhu@gmail.com>
+From: Stan Hu <stanhu@gmail.com>
+Date: Thu, 29 Aug 2024 21:08:09 -0700
+Subject: [PATCH 1/2] Update zrange calls to be Redis 6.0 compatible
+
+This reverts some of the changes in
+https://github.com/sidekiq/sidekiq/issues/5788 to maintain Redis 6.0
+compatibility.
+---
+ lib/sidekiq/api.rb                  | 6 +++---
+ lib/sidekiq/cli.rb                  | 2 +-
+ lib/sidekiq/paginator.rb            | 2 +-
+ lib/sidekiq/redis_client_adapter.rb | 2 +-
+ lib/sidekiq/scheduled.rb            | 2 +-
+ 5 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/lib/sidekiq/api.rb b/lib/sidekiq/api.rb
+index a2a40918..0739044f 100644
+--- a/lib/sidekiq/api.rb
++++ b/lib/sidekiq/api.rb
+@@ -570,7 +570,7 @@ module Sidekiq
+     def remove_job
+       Sidekiq.redis do |conn|
+         results = conn.multi { |transaction|
+-          transaction.zrange(parent.name, score, score, "BYSCORE")
++          transaction.zrangebyscore(parent.name, score, score)
+           transaction.zremrangebyscore(parent.name, score, score)
+         }.first
+ 
+@@ -705,7 +705,7 @@ module Sidekiq
+         end
+ 
+       elements = Sidekiq.redis { |conn|
+-        conn.zrange(name, begin_score, end_score, "BYSCORE", "withscores")
++        conn.zrangebyscore(name, begin_score, end_score, withscores: true)
+       }
+ 
+       elements.each_with_object([]) do |element, result|
+@@ -746,7 +746,7 @@ module Sidekiq
+     # @api private
+     def delete_by_jid(score, jid)
+       Sidekiq.redis do |conn|
+-        elements = conn.zrange(name, score, score, "BYSCORE")
++        elements = conn.zrangebyscore(name, score, score)
+         elements.each do |element|
+           if element.index(jid)
+             message = Sidekiq.load_json(element)
+diff --git a/lib/sidekiq/cli.rb b/lib/sidekiq/cli.rb
+index 66f53418..8dcf9747 100644
+--- a/lib/sidekiq/cli.rb
++++ b/lib/sidekiq/cli.rb
+@@ -74,7 +74,7 @@ module Sidekiq # :nodoc:
+       # fire startup and start multithreading.
+       info = @config.redis_info
+       ver = Gem::Version.new(info["redis_version"])
+-      raise "You are connecting to Redis #{ver}, Sidekiq requires Redis 6.2.0 or greater" if ver < Gem::Version.new("6.2.0")
++      logger.warn "You are connecting to Redis #{ver}, Sidekiq requires Redis 6.2.0 or greater" if ver < Gem::Version.new("6.2.0")
+ 
+       maxmemory_policy = info["maxmemory_policy"]
+       if maxmemory_policy != "noeviction" && maxmemory_policy != ""
+diff --git a/lib/sidekiq/paginator.rb b/lib/sidekiq/paginator.rb
+index 194f9c0f..e895fee5 100644
+--- a/lib/sidekiq/paginator.rb
++++ b/lib/sidekiq/paginator.rb
+@@ -19,7 +19,7 @@ module Sidekiq
+           total_size, items = conn.multi { |transaction|
+             transaction.zcard(key)
+             if rev
+-              transaction.zrange(key, starting, ending, "REV", "withscores")
++              transaction.zrevrange(key, starting, ending, withscores: true)
+             else
+               transaction.zrange(key, starting, ending, "withscores")
+             end
+diff --git a/lib/sidekiq/redis_client_adapter.rb b/lib/sidekiq/redis_client_adapter.rb
+index ca78c239..ea4f35c5 100644
+--- a/lib/sidekiq/redis_client_adapter.rb
++++ b/lib/sidekiq/redis_client_adapter.rb
+@@ -10,7 +10,7 @@ module Sidekiq
+     CommandError = RedisClient::CommandError
+ 
+     # You can add/remove items or clear the whole thing if you don't want deprecation warnings.
+-    DEPRECATED_COMMANDS = %i[rpoplpush zrangebyscore zrevrange zrevrangebyscore getset hmset setex setnx].to_set
++    DEPRECATED_COMMANDS = %i[rpoplpush zrevrangebyscore getset hmset setex setnx].to_set
+ 
+     module CompatMethods
+       def info
+diff --git a/lib/sidekiq/scheduled.rb b/lib/sidekiq/scheduled.rb
+index 7c897dbf..f019e6d8 100644
+--- a/lib/sidekiq/scheduled.rb
++++ b/lib/sidekiq/scheduled.rb
+@@ -12,7 +12,7 @@ module Sidekiq
+ 
+       LUA_ZPOPBYSCORE = <<~LUA
+         local key, now = KEYS[1], ARGV[1]
+-        local jobs = redis.call("zrange", key, "-inf", now, "byscore", "limit", 0, 1)
++        local jobs = redis.call("zrangebyscore", key, "-inf", now, "limit", 0, 1)
+         if jobs[1] then
+           redis.call("zrem", key, jobs[1])
+           return jobs[1]
+-- 
+2.46.0
+
diff --git a/vendor/gems/sidekiq/patches/0002-Update-Sidekiq-gemspec-to-avoid-use-of-git.patch b/vendor/gems/sidekiq/patches/0002-Update-Sidekiq-gemspec-to-avoid-use-of-git.patch
new file mode 100644
index 00000000000..b5ec30d9b4d
--- /dev/null
+++ b/vendor/gems/sidekiq/patches/0002-Update-Sidekiq-gemspec-to-avoid-use-of-git.patch
@@ -0,0 +1,155 @@
+From 862acd0bf2b9d833181e899a77199c2b645ee8d1 Mon Sep 17 00:00:00 2001
+Message-ID: <862acd0bf2b9d833181e899a77199c2b645ee8d1.1724993234.git.stanhu@gmail.com>
+In-Reply-To: <60542e46e14af0f2304a8735164037d2b1dd025c.1724993234.git.stanhu@gmail.com>
+References: <60542e46e14af0f2304a8735164037d2b1dd025c.1724993234.git.stanhu@gmail.com>
+From: Stan Hu <stanhu@gmail.com>
+Date: Thu, 29 Aug 2024 21:14:07 -0700
+Subject: [PATCH 2/2] Update Sidekiq gemspec to avoid use of git
+
+In Cloud Native GitLab, neither `git` nor the Git repository data
+is available.
+---
+ sidekiq.gemspec | 127 +++++++++++++++++++++++++++++++++++++++++++++++-
+ 1 file changed, 126 insertions(+), 1 deletion(-)
+
+diff --git a/sidekiq.gemspec b/sidekiq.gemspec
+index 29b405a3..a1255421 100644
+--- a/sidekiq.gemspec
++++ b/sidekiq.gemspec
+@@ -9,7 +9,132 @@ Gem::Specification.new do |gem|
+   gem.license = "LGPL-3.0"
+ 
+   gem.executables = ["sidekiq", "sidekiqmon"]
+-  gem.files = %w[sidekiq.gemspec README.md Changes.md LICENSE.txt] + `git ls-files | grep -E '^(bin|lib|web)'`.split("\n")
++  gem.files = %w[
++    sidekiq.gemspec
++    README.md
++    Changes.md
++    LICENSE.txt
++    bin/multi_queue_bench
++    bin/sidekiq
++    bin/sidekiqload
++    bin/sidekiqmon
++    lib/generators/sidekiq/job_generator.rb
++    lib/generators/sidekiq/templates/job.rb.erb
++    lib/generators/sidekiq/templates/job_spec.rb.erb
++    lib/generators/sidekiq/templates/job_test.rb.erb
++    lib/sidekiq.rb
++    lib/sidekiq/api.rb
++    lib/sidekiq/capsule.rb
++    lib/sidekiq/cli.rb
++    lib/sidekiq/client.rb
++    lib/sidekiq/component.rb
++    lib/sidekiq/config.rb
++    lib/sidekiq/deploy.rb
++    lib/sidekiq/embedded.rb
++    lib/sidekiq/fetch.rb
++    lib/sidekiq/job.rb
++    lib/sidekiq/job_logger.rb
++    lib/sidekiq/job_retry.rb
++    lib/sidekiq/job_util.rb
++    lib/sidekiq/launcher.rb
++    lib/sidekiq/logger.rb
++    lib/sidekiq/manager.rb
++    lib/sidekiq/metrics/query.rb
++    lib/sidekiq/metrics/shared.rb
++    lib/sidekiq/metrics/tracking.rb
++    lib/sidekiq/middleware/chain.rb
++    lib/sidekiq/middleware/current_attributes.rb
++    lib/sidekiq/middleware/i18n.rb
++    lib/sidekiq/middleware/modules.rb
++    lib/sidekiq/monitor.rb
++    lib/sidekiq/paginator.rb
++    lib/sidekiq/processor.rb
++    lib/sidekiq/rails.rb
++    lib/sidekiq/redis_client_adapter.rb
++    lib/sidekiq/redis_connection.rb
++    lib/sidekiq/ring_buffer.rb
++    lib/sidekiq/scheduled.rb
++    lib/sidekiq/sd_notify.rb
++    lib/sidekiq/systemd.rb
++    lib/sidekiq/testing.rb
++    lib/sidekiq/testing/inline.rb
++    lib/sidekiq/transaction_aware_client.rb
++    lib/sidekiq/version.rb
++    lib/sidekiq/web.rb
++    lib/sidekiq/web/action.rb
++    lib/sidekiq/web/application.rb
++    lib/sidekiq/web/csrf_protection.rb
++    lib/sidekiq/web/helpers.rb
++    lib/sidekiq/web/router.rb
++    lib/sidekiq/worker_compatibility_alias.rb
++    web/assets/images/apple-touch-icon.png
++    web/assets/images/favicon.ico
++    web/assets/images/logo.png
++    web/assets/images/status.png
++    web/assets/javascripts/application.js
++    web/assets/javascripts/base-charts.js
++    web/assets/javascripts/chart.min.js
++    web/assets/javascripts/chartjs-plugin-annotation.min.js
++    web/assets/javascripts/dashboard-charts.js
++    web/assets/javascripts/dashboard.js
++    web/assets/javascripts/metrics.js
++    web/assets/stylesheets/application-dark.css
++    web/assets/stylesheets/application-rtl.css
++    web/assets/stylesheets/application.css
++    web/assets/stylesheets/bootstrap-rtl.min.css
++    web/assets/stylesheets/bootstrap.css
++    web/locales/ar.yml
++    web/locales/cs.yml
++    web/locales/da.yml
++    web/locales/de.yml
++    web/locales/el.yml
++    web/locales/en.yml
++    web/locales/es.yml
++    web/locales/fa.yml
++    web/locales/fr.yml
++    web/locales/gd.yml
++    web/locales/he.yml
++    web/locales/hi.yml
++    web/locales/it.yml
++    web/locales/ja.yml
++    web/locales/ko.yml
++    web/locales/lt.yml
++    web/locales/nb.yml
++    web/locales/nl.yml
++    web/locales/pl.yml
++    web/locales/pt-br.yml
++    web/locales/pt.yml
++    web/locales/ru.yml
++    web/locales/sv.yml
++    web/locales/ta.yml
++    web/locales/uk.yml
++    web/locales/ur.yml
++    web/locales/vi.yml
++    web/locales/zh-cn.yml
++    web/locales/zh-tw.yml
++    web/views/_footer.erb
++    web/views/_job_info.erb
++    web/views/_metrics_period_select.erb
++    web/views/_nav.erb
++    web/views/_paging.erb
++    web/views/_poll_link.erb
++    web/views/_status.erb
++    web/views/_summary.erb
++    web/views/busy.erb
++    web/views/dashboard.erb
++    web/views/dead.erb
++    web/views/filtering.erb
++    web/views/layout.erb
++    web/views/metrics.erb
++    web/views/metrics_for_job.erb
++    web/views/morgue.erb
++    web/views/queue.erb
++    web/views/queues.erb
++    web/views/retries.erb
++    web/views/retry.erb
++    web/views/scheduled.erb
++    web/views/scheduled_job_info.erb
++  ]
+   gem.name = "sidekiq"
+   gem.version = Sidekiq::VERSION
+   gem.required_ruby_version = ">= 2.7.0"
+-- 
+2.46.0
+
diff --git a/vendor/gems/sidekiq/scripts/update-sidekiq.sh b/vendor/gems/sidekiq/scripts/update-sidekiq.sh
new file mode 100755
index 00000000000..07aac4f95bd
--- /dev/null
+++ b/vendor/gems/sidekiq/scripts/update-sidekiq.sh
@@ -0,0 +1,47 @@
+#!/bin/bash
+
+set -euo pipefail
+
+if [ "$#" -ne 2 ]; then
+    echo "Usage: $0 <Sidekiq version> <vendored gem directory>"
+    echo ""
+    echo "Example: $0 7.3.1 /path/to/gdk/gitlab/vendor/gems/sidekiq"
+    exit 1
+fi
+
+VERSION=$1
+TARGET_DIR=$2
+TEMP_DIR=$(mktemp -d)
+GEM_DIR=sidekiq-$VERSION
+GIT_REPO=https://github.com/sidekiq/sidekiq
+PATCH_DIR=$(realpath "$TARGET_DIR/patches")
+
+pushd . > /dev/null
+# Unpack gem
+cd "$TEMP_DIR"
+echo "Unpacking sidekiq gem $VERSION..."
+gem unpack sidekiq -v "$VERSION"
+echo "Cloning $GIT_REPO..."
+git clone --depth 1 -b "v$VERSION" https://github.com/sidekiq/sidekiq.git sidekiq.git
+cd "$GEM_DIR"
+cp -r ../sidekiq.git/test .
+
+echo "Applying GitLab patches..."
+for patch in "$PATCH_DIR"/*.patch; do
+    echo "Applying $patch"
+    patch -p1 < "$patch"
+done
+
+echo "Copying updated Sidekiq files from $TEMP_DIR/$GEM_DIR into $TARGET_DIR"
+popd > /dev/null
+cp -r "$TEMP_DIR/$GEM_DIR"/* "$TARGET_DIR"
+rm -rf "$TEMP_DIR"
+
+bundle install
+
+echo "Update complete! You can now:"
+echo ""
+echo "1. Inspect 'git status' to see if any files have been added. Be sure to commit them."
+echo "2. Inspect the changes via 'git diff'".
+echo "3. Run tests locally by running 'redis-server' and 'bundle exec rake test'."
+echo "4. Update NOTICE.txt to reflect the current date."
diff --git a/vendor/gems/sidekiq-7.2.4/sidekiq.gemspec b/vendor/gems/sidekiq/sidekiq.gemspec
similarity index 98%
rename from vendor/gems/sidekiq-7.2.4/sidekiq.gemspec
rename to vendor/gems/sidekiq/sidekiq.gemspec
index a12554218f6..c7e4ed2b474 100644
--- a/vendor/gems/sidekiq-7.2.4/sidekiq.gemspec
+++ b/vendor/gems/sidekiq/sidekiq.gemspec
@@ -148,8 +148,9 @@ Gem::Specification.new do |gem|
     "rubygems_mfa_required" => "true"
   }
 
-  gem.add_dependency "redis-client", ">= 0.19.0"
+  gem.add_dependency "redis-client", ">= 0.22.2"
   gem.add_dependency "connection_pool", ">= 2.3.0"
   gem.add_dependency "rack", ">= 2.2.4"
   gem.add_dependency "concurrent-ruby", "< 2"
+  gem.add_dependency "logger"
 end
diff --git a/vendor/gems/sidekiq-7.2.4/test/actors_test.rb b/vendor/gems/sidekiq/test/actors_test.rb
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/test/actors_test.rb
rename to vendor/gems/sidekiq/test/actors_test.rb
diff --git a/vendor/gems/sidekiq-7.2.4/test/api_test.rb b/vendor/gems/sidekiq/test/api_test.rb
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/test/api_test.rb
rename to vendor/gems/sidekiq/test/api_test.rb
diff --git a/vendor/gems/sidekiq-7.2.4/test/capsule_test.rb b/vendor/gems/sidekiq/test/capsule_test.rb
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/test/capsule_test.rb
rename to vendor/gems/sidekiq/test/capsule_test.rb
diff --git a/vendor/gems/sidekiq-7.2.4/test/cfg/config__FILE__and__dir__.yml b/vendor/gems/sidekiq/test/cfg/config__FILE__and__dir__.yml
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/test/cfg/config__FILE__and__dir__.yml
rename to vendor/gems/sidekiq/test/cfg/config__FILE__and__dir__.yml
diff --git a/vendor/gems/sidekiq-7.2.4/test/cfg/config_capsules.yml b/vendor/gems/sidekiq/test/cfg/config_capsules.yml
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/test/cfg/config_capsules.yml
rename to vendor/gems/sidekiq/test/cfg/config_capsules.yml
diff --git a/vendor/gems/sidekiq-7.2.4/test/cfg/config_empty.yml b/vendor/gems/sidekiq/test/cfg/config_empty.yml
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/test/cfg/config_empty.yml
rename to vendor/gems/sidekiq/test/cfg/config_empty.yml
diff --git a/vendor/gems/sidekiq-7.2.4/test/cfg/config_environment.yml b/vendor/gems/sidekiq/test/cfg/config_environment.yml
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/test/cfg/config_environment.yml
rename to vendor/gems/sidekiq/test/cfg/config_environment.yml
diff --git a/vendor/gems/sidekiq-7.2.4/test/cfg/config_queues_without_weights.yml b/vendor/gems/sidekiq/test/cfg/config_queues_without_weights.yml
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/test/cfg/config_queues_without_weights.yml
rename to vendor/gems/sidekiq/test/cfg/config_queues_without_weights.yml
diff --git a/vendor/gems/sidekiq-7.2.4/test/cfg/config_string.yml b/vendor/gems/sidekiq/test/cfg/config_string.yml
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/test/cfg/config_string.yml
rename to vendor/gems/sidekiq/test/cfg/config_string.yml
diff --git a/vendor/gems/sidekiq-7.2.4/test/cfg/config_with_alias.yml b/vendor/gems/sidekiq/test/cfg/config_with_alias.yml
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/test/cfg/config_with_alias.yml
rename to vendor/gems/sidekiq/test/cfg/config_with_alias.yml
diff --git a/vendor/gems/sidekiq-7.2.4/test/cfg/config_with_internal_options.yml b/vendor/gems/sidekiq/test/cfg/config_with_internal_options.yml
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/test/cfg/config_with_internal_options.yml
rename to vendor/gems/sidekiq/test/cfg/config_with_internal_options.yml
diff --git a/vendor/gems/sidekiq-7.2.4/test/cli_test.rb b/vendor/gems/sidekiq/test/cli_test.rb
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/test/cli_test.rb
rename to vendor/gems/sidekiq/test/cli_test.rb
diff --git a/vendor/gems/sidekiq-7.2.4/test/client_test.rb b/vendor/gems/sidekiq/test/client_test.rb
similarity index 91%
rename from vendor/gems/sidekiq-7.2.4/test/client_test.rb
rename to vendor/gems/sidekiq/test/client_test.rb
index a2b79f57a55..33221356758 100644
--- a/vendor/gems/sidekiq-7.2.4/test/client_test.rb
+++ b/vendor/gems/sidekiq/test/client_test.rb
@@ -571,4 +571,54 @@ describe Sidekiq::Client do
     assert_equal job_count, jids.size
     assert_equal times, jids.map { |jid| Sidekiq::ScheduledSet.new.find_job(jid).at }
   end
+
+  describe "retry after Redis error" do
+    it "retries scheduled jobs correctly" do
+      aggregator = Hash.new do |hash, key|
+        hash[key] = Hash.new do |inner_hash, inner_key|
+          inner_hash[inner_key] = []
+        end
+      end
+
+      aggregator[:raised_once] = false
+
+      pool = Sidekiq::RedisConnection.create(size: 1)
+
+      pool.with do |conn|
+        pipeline = Object.new
+
+        conn.define_singleton_method(:pipelined) do |&block|
+          block.call(pipeline)
+        end
+
+        pipeline.define_singleton_method(:zadd) do |set, payloads|
+          if aggregator[:raised_once] == false
+            aggregator[:raised_once] = true
+            raise RedisClient::Error, "READONLY"
+          else
+            aggregator[:zadd][set].push(*payloads)
+          end
+        end
+
+        pipeline.define_singleton_method(:sadd) do |set, elements|
+          aggregator[:sadd][set].push(*elements)
+        end
+
+        pipeline.define_singleton_method(:lpush) do |list, elements|
+          aggregator[:lpush][list].push(*elements)
+        end
+      end
+
+      Sidekiq::Client.via(pool) do
+        client = Sidekiq::Client.new
+        client.push_bulk("class" => MyJob, "args" => (1..10).map { [_1] }, "at" => 10)
+      end
+
+      # 20 since the array of [at, dumped_payload] elements gets flattened.
+      assert_equal 20, aggregator[:zadd]["schedule"].size
+      assert_equal [], aggregator[:sadd]["queues"]
+      assert_equal 0, aggregator[:lpush]["queue:default"].size
+      assert_equal true, aggregator[:raised_once]
+    end
+  end
 end
diff --git a/vendor/gems/sidekiq-7.2.4/test/config.yml b/vendor/gems/sidekiq/test/config.yml
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/test/config.yml
rename to vendor/gems/sidekiq/test/config.yml
diff --git a/vendor/gems/sidekiq-7.2.4/test/config_test.rb b/vendor/gems/sidekiq/test/config_test.rb
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/test/config_test.rb
rename to vendor/gems/sidekiq/test/config_test.rb
diff --git a/vendor/gems/sidekiq-7.2.4/test/csrf_test.rb b/vendor/gems/sidekiq/test/csrf_test.rb
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/test/csrf_test.rb
rename to vendor/gems/sidekiq/test/csrf_test.rb
diff --git a/vendor/gems/sidekiq-7.2.4/test/current_attributes_test.rb b/vendor/gems/sidekiq/test/current_attributes_test.rb
similarity index 81%
rename from vendor/gems/sidekiq-7.2.4/test/current_attributes_test.rb
rename to vendor/gems/sidekiq/test/current_attributes_test.rb
index dab008cb0e2..b31e08f96b3 100644
--- a/vendor/gems/sidekiq-7.2.4/test/current_attributes_test.rb
+++ b/vendor/gems/sidekiq/test/current_attributes_test.rb
@@ -14,6 +14,13 @@ module Myapp
   end
 end
 
+class CurrentAttributesJob
+  include Sidekiq::Job
+
+  def perform
+  end
+end
+
 describe "Current attributes" do
   before do
     @config = reset!
@@ -94,6 +101,27 @@ describe "Current attributes" do
     end
   end
 
+  it "persists after perform_inline" do
+    Sidekiq::CurrentAttributes.persist("Myapp::Current", @config)
+    with_context("Myapp::Current", :user_id, 16) do
+      assert_equal 16, Myapp::Current.user_id
+      CurrentAttributesJob.perform_inline
+      assert_equal 16, Myapp::Current.user_id
+    end
+  end
+
+  it "ignores non-existent attributes" do
+    cm = Sidekiq::CurrentAttributes::Load.new({
+      "cattr" => "Myapp::Current"
+    })
+
+    job = {"cattr" => {"user_id" => 123, "non_existent" => 456}}
+    assert_nil Myapp::Current.user_id
+    cm.call(nil, job, nil) do
+      assert_equal 123, Myapp::Current.user_id
+    end
+  end
+
   private
 
   def with_context(strklass, attr, value)
diff --git a/vendor/gems/sidekiq-7.2.4/test/dead_set_test.rb b/vendor/gems/sidekiq/test/dead_set_test.rb
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/test/dead_set_test.rb
rename to vendor/gems/sidekiq/test/dead_set_test.rb
diff --git a/vendor/gems/sidekiq-7.2.4/test/dummy/config/application.rb b/vendor/gems/sidekiq/test/dummy/config/application.rb
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/test/dummy/config/application.rb
rename to vendor/gems/sidekiq/test/dummy/config/application.rb
diff --git a/vendor/gems/sidekiq-7.2.4/test/dummy/config/database.yml b/vendor/gems/sidekiq/test/dummy/config/database.yml
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/test/dummy/config/database.yml
rename to vendor/gems/sidekiq/test/dummy/config/database.yml
diff --git a/vendor/gems/sidekiq-7.2.4/test/dummy/config/environment.rb b/vendor/gems/sidekiq/test/dummy/config/environment.rb
similarity index 66%
rename from vendor/gems/sidekiq-7.2.4/test/dummy/config/environment.rb
rename to vendor/gems/sidekiq/test/dummy/config/environment.rb
index 73a3979b06b..e8173e052ec 100644
--- a/vendor/gems/sidekiq-7.2.4/test/dummy/config/environment.rb
+++ b/vendor/gems/sidekiq/test/dummy/config/environment.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative "application"
 
 Rails.application.initialize!
diff --git a/vendor/gems/sidekiq-7.2.4/test/dummy/config/sidekiq.yml b/vendor/gems/sidekiq/test/dummy/config/sidekiq.yml
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/test/dummy/config/sidekiq.yml
rename to vendor/gems/sidekiq/test/dummy/config/sidekiq.yml
diff --git a/vendor/gems/sidekiq-7.2.4/test/dummy/tmp/.keep b/vendor/gems/sidekiq/test/dummy/tmp/.keep
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/test/dummy/tmp/.keep
rename to vendor/gems/sidekiq/test/dummy/tmp/.keep
diff --git a/vendor/gems/sidekiq-7.2.4/test/dummy/tmp/development_secret.txt b/vendor/gems/sidekiq/test/dummy/tmp/development_secret.txt
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/test/dummy/tmp/development_secret.txt
rename to vendor/gems/sidekiq/test/dummy/tmp/development_secret.txt
diff --git a/vendor/gems/sidekiq-7.2.4/test/dummy/tmp/local_secret.txt b/vendor/gems/sidekiq/test/dummy/tmp/local_secret.txt
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/test/dummy/tmp/local_secret.txt
rename to vendor/gems/sidekiq/test/dummy/tmp/local_secret.txt
diff --git a/vendor/gems/sidekiq-7.2.4/test/exception_handler_test.rb b/vendor/gems/sidekiq/test/exception_handler_test.rb
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/test/exception_handler_test.rb
rename to vendor/gems/sidekiq/test/exception_handler_test.rb
diff --git a/vendor/gems/sidekiq-7.2.4/test/fake_env.rb b/vendor/gems/sidekiq/test/fake_env.rb
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/test/fake_env.rb
rename to vendor/gems/sidekiq/test/fake_env.rb
diff --git a/vendor/gems/sidekiq-7.2.4/test/fetch_test.rb b/vendor/gems/sidekiq/test/fetch_test.rb
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/test/fetch_test.rb
rename to vendor/gems/sidekiq/test/fetch_test.rb
diff --git a/vendor/gems/sidekiq-7.2.4/test/filtering_test.rb b/vendor/gems/sidekiq/test/filtering_test.rb
similarity index 97%
rename from vendor/gems/sidekiq-7.2.4/test/filtering_test.rb
rename to vendor/gems/sidekiq/test/filtering_test.rb
index d6b1a912260..e3e73f5f3bf 100644
--- a/vendor/gems/sidekiq-7.2.4/test/filtering_test.rb
+++ b/vendor/gems/sidekiq/test/filtering_test.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative "helper"
 require "sidekiq/web"
 require "rack/test"
diff --git a/vendor/gems/sidekiq-7.2.4/test/fixtures/en.yml b/vendor/gems/sidekiq/test/fixtures/en.yml
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/test/fixtures/en.yml
rename to vendor/gems/sidekiq/test/fixtures/en.yml
diff --git a/vendor/gems/sidekiq/test/fixtures/products.csv b/vendor/gems/sidekiq/test/fixtures/products.csv
new file mode 100644
index 00000000000..0c93763460f
--- /dev/null
+++ b/vendor/gems/sidekiq/test/fixtures/products.csv
@@ -0,0 +1,12 @@
+shop_id,product_id,title
+1,101,Apple
+2,102,Banana
+3,103,Orange
+4,104,Cranberry
+5,105,Raspberry
+6,106,Kiwi
+7,107,Grapefruit
+8,108,Mango
+9,109,Watermelon
+10,110,Mellon
+11,111,Peach
diff --git a/vendor/gems/sidekiq-7.2.4/test/helper.rb b/vendor/gems/sidekiq/test/helper.rb
similarity index 81%
rename from vendor/gems/sidekiq-7.2.4/test/helper.rb
rename to vendor/gems/sidekiq/test/helper.rb
index b841b229314..8bfed4df0b0 100644
--- a/vendor/gems/sidekiq-7.2.4/test/helper.rb
+++ b/vendor/gems/sidekiq/test/helper.rb
@@ -24,7 +24,7 @@ if ENV["COVERAGE"]
   end
 end
 
-ENV["REDIS_URL"] ||= "redis://localhost/15"
+ENV["REDIS_URL"] ||= "redis://localhost:6379/0"
 NULL_LOGGER = Logger.new(IO::NULL)
 
 def reset!
@@ -34,7 +34,7 @@ def reset!
     existing_pool&.shutdown(&:close)
   end
 
-  RedisClient.new(url: ENV["REDIS_URL"]).call("flushall")
+  RedisClient.new(url: ENV["REDIS_URL"]).call("flushdb")
   cfg = Sidekiq::Config.new
   cfg[:backtrace_cleaner] = Sidekiq::Config::DEFAULTS[:backtrace_cleaner]
   cfg.logger = NULL_LOGGER
@@ -67,3 +67,10 @@ Signal.trap("TTIN") do
     end
   end
 end
+
+require "active_job"
+
+# need to force this since we aren't booting a Rails app
+ActiveJob::Base.queue_adapter = :sidekiq
+ActiveJob::Base.logger = nil
+ActiveJob::Base.send(:include, ::Sidekiq::Job::Options) unless ActiveJob::Base.respond_to?(:sidekiq_options)
diff --git a/vendor/gems/sidekiq/test/iterable/active_record_enumerator_test.rb b/vendor/gems/sidekiq/test/iterable/active_record_enumerator_test.rb
new file mode 100644
index 00000000000..ade13fb95fe
--- /dev/null
+++ b/vendor/gems/sidekiq/test/iterable/active_record_enumerator_test.rb
@@ -0,0 +1,138 @@
+# frozen_string_literal: true
+
+require "csv"
+require "active_record"
+require "sidekiq"
+require_relative "../helper"
+require_relative "../dummy/config/environment"
+
+class Product < ActiveRecord::Base
+end
+
+describe Sidekiq::Job::Iterable::ActiveRecordEnumerator do
+  before(:all) do
+    Product.connection.create_table(:products, force: true)
+    products = [9, 1, 3, 2, 7, 6, 4, 5, 8, 10].map { |id| {id: id} }
+    Product.insert_all!(products)
+  end
+
+  describe "#records" do
+    it "yields every record with their cursor position" do
+      enum = build_enumerator.records
+      assert_equal Product.count, enum.size
+
+      products = Product.order(:id).take(3)
+      enum.first(3).each_with_index do |(record, cursor), index|
+        product = products[index]
+        assert_equal product, record
+        assert_equal product.id, cursor
+      end
+    end
+
+    it "does not yield anything if the relation is empty" do
+      enum = build_enumerator(relation: Product.none).records
+
+      assert_empty enum.to_a
+      assert_equal 0, enum.size
+    end
+
+    it "can be resumed" do
+      enum = build_enumerator(cursor: Product.second.id).records
+      assert_equal Product.count, enum.size
+
+      products = Product.order(:id).offset(1).take(3)
+      enum.first(3).each_with_index do |(record, cursor), index|
+        product = products[index]
+        assert_equal product, record
+        assert_equal product.id, cursor
+      end
+    end
+  end
+
+  describe "#batches" do
+    it "yields batches of records with the last record's cursor position" do
+      enum = build_enumerator.batches
+      assert_equal 10, enum.size
+
+      products = Product.order(:id).take(4).each_slice(2).to_a
+
+      enum.first(2).each_with_index do |(batch, cursor), index|
+        expected_batch = products[index]
+        expected_cursor = expected_batch.last.id
+        assert_equal expected_batch, batch
+        assert_equal expected_cursor, cursor
+      end
+    end
+
+    it "does not yield anything if the relation is empty" do
+      enum = build_enumerator(relation: Product.none).batches
+      assert_empty enum.to_a
+    end
+
+    it "can be resumed" do
+      enum = build_enumerator(cursor: Product.second.id).batches
+      assert_equal 10, enum.size
+
+      products = Product.order(:id).offset(1).take(4).each_slice(2).to_a
+
+      enum.first(2).each_with_index do |(batch, cursor), index|
+        expected_records = products[index]
+        expected_cursor = expected_records.last.id
+        assert_equal expected_records, batch
+        assert_equal expected_cursor, cursor
+      end
+    end
+  end
+
+  describe "#relations" do
+    it "yields relations with the last record's cursor position" do
+      enum = build_enumerator.relations
+      assert_equal 5, enum.size
+
+      product_batches = Product.order(:id).take(4).in_groups_of(2)
+
+      enum.first(2).each_with_index do |(relation, cursor), index|
+        assert_kind_of ActiveRecord::Relation, relation
+
+        expected_records = product_batches[index]
+        expected_cursor = expected_records.last.id
+        assert_equal expected_records, relation.to_a
+        assert_equal expected_cursor, cursor
+      end
+    end
+
+    it "yields unloaded relations" do
+      enum = build_enumerator.relations
+      relation, = enum.first
+
+      refute relation.loaded?
+    end
+
+    it "does not yield anything if the relation is empty" do
+      enum = build_enumerator(relation: Product.none).relations
+      assert_empty enum.to_a
+    end
+
+    it "can be resumed" do
+      enum = build_enumerator(cursor: Product.second.id).relations
+      assert_equal 5, enum.size
+
+      product_batches = Product.order(:id).offset(1).take(4).in_groups_of(2)
+
+      enum.first(2).each_with_index do |(relation, cursor), index|
+        assert_kind_of ActiveRecord::Relation, relation
+
+        expected_records = product_batches[index]
+        expected_cursor = expected_records.last.id
+        assert_equal expected_records, relation.to_a
+        assert_equal expected_cursor, cursor
+      end
+    end
+  end
+
+  private
+
+  def build_enumerator(relation: Product.all, batch_size: 2, cursor: nil)
+    Sidekiq::Job::Iterable::ActiveRecordEnumerator.new(relation, batch_size: batch_size, cursor: cursor)
+  end
+end
diff --git a/vendor/gems/sidekiq/test/iterable/csv_enumerator_test.rb b/vendor/gems/sidekiq/test/iterable/csv_enumerator_test.rb
new file mode 100644
index 00000000000..4cf7294a612
--- /dev/null
+++ b/vendor/gems/sidekiq/test/iterable/csv_enumerator_test.rb
@@ -0,0 +1,102 @@
+# frozen_string_literal: true
+
+require "csv"
+require "sidekiq"
+require_relative "../helper"
+
+describe Sidekiq::Job::Iterable::CsvEnumerator do
+  it "raises if passed object is not a CSV" do
+    e = assert_raises(ArgumentError) do
+      build_enumerator([])
+    end
+    assert_equal "CsvEnumerator.new takes CSV object", e.message
+  end
+
+  describe "#rows" do
+    it "yields every record with their cursor position" do
+      enum = build_enumerator(products_csv).rows(cursor: nil)
+      assert_instance_of Enumerator::Lazy, enum
+
+      enum.each_with_index do |(element, cursor), index|
+        assert_equal [csv_rows[index], index], [element.fields, cursor]
+      end
+    end
+
+    it "can be resumed" do
+      enum = build_enumerator(products_csv).rows(cursor: 3)
+      assert_instance_of Enumerator::Lazy, enum
+
+      enum.each_with_index do |(element, cursor), index|
+        assert_equal [csv_rows[index + 3], index + 3], [element.fields, cursor]
+      end
+    end
+
+    it "returns size excluding headers" do
+      enum = build_enumerator(products_csv(headers: false)).rows(cursor: 0)
+      assert_equal 12, enum.size
+
+      enum = build_enumerator(products_csv(headers: true)).rows(cursor: 0)
+      assert_equal 11, enum.size
+    end
+
+    it "returns nil count for a CSV object from a String" do
+      csv_string = File.read("test/fixtures/products.csv")
+      enum = build_enumerator(CSV.new(csv_string)).rows(cursor: 0)
+      assert_nil enum.size
+    end
+
+    it "returns total size if resumed" do
+      enum = build_enumerator(products_csv).rows(cursor: 10)
+      assert_equal 11, enum.size
+    end
+  end
+
+  describe "#batches" do
+    it "yields every batch with their cursor position" do
+      enum = build_enumerator(products_csv).batches(batch_size: 3, cursor: nil)
+      assert_instance_of Enumerator::Lazy, enum
+
+      expected_values = csv_rows.each_slice(3).to_a
+      enum.each_with_index do |(element, cursor), index|
+        assert_equal [expected_values[index], index], [element.map(&:fields), cursor]
+      end
+    end
+
+    it "can be resumed" do
+      enum = build_enumerator(products_csv).batches(batch_size: 3, cursor: 2)
+      assert_instance_of Enumerator::Lazy, enum
+
+      expected_values = csv_rows.each_slice(3).drop(2).to_a
+      enum.each_with_index do |(element, cursor), index|
+        assert_equal [expected_values[index], index + 2], [element.map(&:fields), cursor]
+      end
+    end
+
+    it "returns size" do
+      enum = build_enumerator(products_csv).batches(batch_size: 2, cursor: 0)
+      assert_equal 6, enum.size
+
+      enum = build_enumerator(products_csv).batches(batch_size: 3, cursor: 0)
+      assert_equal 4, enum.size
+    end
+
+    it "returns total size if resumed" do
+      enum = build_enumerator(products_csv).batches(batch_size: 2, cursor: 5)
+      assert_equal 6, enum.size
+    end
+  end
+
+  private
+
+  def build_enumerator(csv)
+    Sidekiq::Job::Iterable::CsvEnumerator.new(csv)
+  end
+
+  def csv_rows
+    @csv_rows ||= products_csv.map(&:fields)
+  end
+
+  def products_csv(options = {})
+    CSV.open("test/fixtures/products.csv", converters: :integer, headers: true, **options)
+  end
+end
diff --git a/vendor/gems/sidekiq/test/iterable/iterable_jobs.rb b/vendor/gems/sidekiq/test/iterable/iterable_jobs.rb
new file mode 100644
index 00000000000..8df5f71e9ab
--- /dev/null
+++ b/vendor/gems/sidekiq/test/iterable/iterable_jobs.rb
@@ -0,0 +1,162 @@
+# frozen_string_literal: true
+
+class SimpleIterableJob
+  include Sidekiq::IterableJob
+
+  cattr_accessor :iterated_objects, default: []
+  cattr_accessor :on_start_called, default: 0
+  cattr_accessor :around_iteration_called, default: 0
+  cattr_accessor :on_resume_called, default: 0
+  cattr_accessor :on_stop_called, default: 0
+  cattr_accessor :on_complete_called, default: 0
+  cattr_accessor :context
+
+  def on_start
+    self.class.on_start_called += 1
+  end
+
+  def around_iteration
+    self.class.around_iteration_called += 1
+    yield
+  end
+
+  def on_resume
+    self.class.on_resume_called += 1
+  end
+
+  def on_stop
+    self.class.on_stop_called += 1
+  end
+
+  def on_complete
+    self.class.on_complete_called += 1
+  end
+end
+
+class MissingBuildEnumeratorJob < SimpleIterableJob
+  def each_iteration(*)
+  end
+end
+
+class JobWithBuildEnumeratorReturningArray < SimpleIterableJob
+  def build_enumerator(*)
+    []
+  end
+end
+
+class MissingEachIterationJob < SimpleIterableJob
+  def build_enumerator(cursor:)
+    array_enumerator([1, 2, 3], cursor: cursor)
+  end
+end
+
+class NilEnumeratorIterableJob < SimpleIterableJob
+  def build_enumerator(*)
+  end
+
+  def each_iteration(*)
+  end
+end
+
+class ArrayIterableJob < SimpleIterableJob
+  cattr_accessor :stop_after_iterations
+
+  def build_enumerator(cursor:)
+    @current_run_iterations = 0
+
+    array_enumerator((10..20).to_a, cursor: cursor)
+  end
+
+  def each_iteration(number)
+    self.class.iterated_objects << number
+    @current_run_iterations += 1
+  end
+
+  def interrupted?
+    @current_run_iterations == stop_after_iterations
+  end
+end
+
+class ActiveRecordRecordsJob < SimpleIterableJob
+  def build_enumerator(cursor:)
+    active_record_records_enumerator(Product.all, cursor: cursor)
+  end
+
+  def each_iteration(record)
+    self.class.iterated_objects << record
+  end
+end
+
+class ActiveRecordBatchesJob < SimpleIterableJob
+  def build_enumerator(cursor:)
+    active_record_batches_enumerator(Product.all, cursor: cursor, batch_size: 3)
+  end
+
+  def each_iteration(batch)
+    self.class.iterated_objects << batch
+  end
+end
+
+class ActiveRecordRelationsJob < SimpleIterableJob
+  def build_enumerator(cursor:)
+    active_record_relations_enumerator(Product.all, cursor: cursor, batch_size: 3)
+  end
+
+  def each_iteration(relation)
+    self.class.iterated_objects << relation
+  end
+end
+
+class CsvIterableJob < SimpleIterableJob
+  def build_enumerator(cursor:)
+    csv = CSV.open("test/fixtures/products.csv", converters: :integer, headers: true)
+    csv_enumerator(csv, cursor: cursor)
+  end
+
+  def each_iteration(row)
+    self.class.iterated_objects << row
+  end
+end
+
+class CsvBatchesIterableJob < SimpleIterableJob
+  def build_enumerator(cursor:)
+    csv = CSV.open("test/fixtures/products.csv", converters: :integer, headers: true)
+    csv_batches_enumerator(csv, cursor: cursor, batch_size: 3)
+  end
+
+  def each_iteration(batch)
+    self.class.iterated_objects << batch
+  end
+end
+
+class IterableJobWithArguments < SimpleIterableJob
+  def build_enumerator(_one_arg, _another_arg, cursor:)
+    array_enumerator([0, 1], cursor: cursor)
+  end
+
+  def each_iteration(number, one_arg, another_arg)
+    self.class.iterated_objects << [number, one_arg, another_arg]
+  end
+end
+
+class EmptyEnumeratorJob < SimpleIterableJob
+  def build_enumerator(cursor:)
+    array_enumerator([], cursor: cursor)
+  end
+
+  def each_iteration(*)
+  end
+end
+
+class AbortingIterableJob < ArrayIterableJob
+  def each_iteration(*)
+    throw(:abort) if self.class.iterated_objects.size == 2
+    super
+  end
+end
+
+class LongRunningIterableJob < ArrayIterableJob
+  def each_iteration(*)
+    sleep(0.01)
+  end
+end
diff --git a/vendor/gems/sidekiq/test/iterable/iterable_test.rb b/vendor/gems/sidekiq/test/iterable/iterable_test.rb
new file mode 100644
index 00000000000..040da6e2509
--- /dev/null
+++ b/vendor/gems/sidekiq/test/iterable/iterable_test.rb
@@ -0,0 +1,267 @@
+# frozen_string_literal: true
+
+require_relative "../helper"
+require "sidekiq/job_retry"
+require "sidekiq/job/interrupt_handler"
+require_relative "iterable_jobs"
+require_relative "../dummy/config/environment"
+
+class Product < ActiveRecord::Base
+end
+
+describe Sidekiq::Job::Iterable do
+  before(:all) do
+    Product.connection.create_table(:products, force: true)
+    products = [9, 1, 3, 2, 7, 6, 4, 5, 8, 10].map { |id| {id: id} }
+    Product.insert_all!(products)
+  end
+
+  before do
+    @config = reset!
+    @context = Minitest::Mock.new
+
+    require "sidekiq/testing"
+    Sidekiq::Testing.fake!
+
+    SimpleIterableJob.descendants.each do |klass|
+      klass.iterated_objects = []
+      klass.on_start_called = 0
+      klass.around_iteration_called = 0
+      klass.on_resume_called = 0
+      klass.on_stop_called = 0
+      klass.on_complete_called = 0
+    end
+    Sidekiq::Job.clear_all
+    SimpleIterableJob.context = @context
+    ArrayIterableJob.stop_after_iterations = nil
+  end
+
+  after do
+    Sidekiq::Testing.disable!
+    Sidekiq::Queues.clear_all
+  end
+
+  it "raises when #build_enumerator method is missing" do
+    e = assert_raises(NotImplementedError) do
+      MissingBuildEnumeratorJob.perform_inline
+    end
+    assert_match(/must implement a '#build_enumerator' method/, e.message)
+  end
+
+  it "raises when #build_enumerator method returns non Enumerator" do
+    e = assert_raises(ArgumentError) do
+      JobWithBuildEnumeratorReturningArray.perform_inline
+    end
+    assert_match(/must return an Enumerator, but returned Array/, e.message)
+  end
+
+  it "raises when #each_iteration method is missing" do
+    e = assert_raises(NotImplementedError) do
+      MissingEachIterationJob.perform_inline
+    end
+    assert_match(/must implement an '#each_iteration' method/, e.message)
+  end
+
+  it "cannot override #perform" do
+    e = assert_raises(RuntimeError) do
+      Class.new do
+        include Sidekiq::IterableJob
+        def perform(*)
+        end
+      end
+    end
+    assert_match(/must not define #perform/, e.message)
+  end
+
+  it "skips the job if #build_enumerator returned nil" do
+    output = capture_logging(@config, Logger::DEBUG) do
+      NilEnumeratorIterableJob.perform_inline
+    end
+    assert_includes(output, "'#build_enumerator' returned nil, skipping the job.")
+  end
+
+  it "iterates over arrays" do
+    ArrayIterableJob.perform_inline
+    numbers = ArrayIterableJob.iterated_objects
+    assert_equal (10..20).to_a, numbers
+  end
+
+  it "iterates over activerecord records" do
+    ActiveRecordRecordsJob.perform_inline
+    records = ActiveRecordRecordsJob.iterated_objects
+    assert_equal (1..10).to_a, records.pluck(:id)
+  end
+
+  it "iterates over activerecord batches" do
+    ActiveRecordBatchesJob.perform_inline
+
+    products = Product.order(:id).to_a
+    batches = ActiveRecordBatchesJob.iterated_objects
+    assert_equal [3, 3, 3, 1], batches.map(&:size)
+    assert_equal products, batches.flatten
+  end
+
+  it "iterates over activerecord relations" do
+    ActiveRecordRelationsJob.perform_inline
+
+    relations = ActiveRecordRelationsJob.iterated_objects
+    assert relations.all?(ActiveRecord::Relation)
+    assert relations.none?(&:loaded?)
+    assert_equal [3, 3, 3, 1], relations.map(&:count)
+
+    products = Product.order(:id).to_a
+    assert_equal products, relations.map(&:records).flatten
+  end
+
+  it "iterates over CSV rows" do
+    CsvIterableJob.perform_inline
+    rows = CsvIterableJob.iterated_objects
+    shop_ids = rows.map { |row| row.fields[0] }
+    assert_equal (1..11).to_a, shop_ids
+  end
+
+  it "iterates over CSV batches" do
+    CsvBatchesIterableJob.perform_inline
+    batches = CsvBatchesIterableJob.iterated_objects
+
+    assert_equal [3, 3, 3, 2], batches.map(&:size)
+    shop_ids = batches.flatten(1).map { |row| row.fields[0] }
+    assert_equal (1..11).to_a, shop_ids
+  end
+
+  it "supports jobs with arguments" do
+    IterableJobWithArguments.perform_inline("arg one", ["arg", "two"])
+
+    expected = [
+      [0, "arg one", ["arg", "two"]],
+      [1, "arg one", ["arg", "two"]]
+    ]
+    assert_equal expected, IterableJobWithArguments.iterated_objects
+  end
+
+  it "logs completion data" do
+    output = capture_logging(@config, Logger::DEBUG) do
+      ArrayIterableJob.perform_inline
+    end
+    assert_match(/Completed iteration/, output)
+  end
+
+  it "logs no iterations" do
+    output = capture_logging(@config, Logger::DEBUG) do
+      EmptyEnumeratorJob.perform_inline
+    end
+    assert_match(/Enumerator found nothing to iterate/, output)
+  end
+
+  it "aborting in #each_iteration will execute #on_complete callback" do
+    AbortingIterableJob.perform_inline
+
+    assert_equal 2, AbortingIterableJob.iterated_objects.size
+    assert_equal 1, AbortingIterableJob.on_complete_called
+    assert_equal 1, AbortingIterableJob.on_stop_called
+  end
+
+  it "can be resumed" do
+    jid = iterate_exact_times(ArrayIterableJob, 2)
+    assert_equal [10, 11], ArrayIterableJob.iterated_objects
+
+    previous_state = fetch_iteration_state(jid)
+    assert_equal 1, previous_state["ex"].to_i
+    assert_equal 2, Sidekiq.load_json(previous_state["c"])
+    assert Float(previous_state["rt"])
+
+    iterate_exact_times(ArrayIterableJob, 2, jid: jid)
+    assert_equal [10, 11, 12, 13], ArrayIterableJob.iterated_objects
+
+    previous_state = fetch_iteration_state(jid)
+    assert_equal 2, previous_state["ex"].to_i
+    assert_equal 4, Sidekiq.load_json(previous_state["c"])
+    assert_operator Float(previous_state["rt"]), :>, 0
+
+    continue_iterating(ArrayIterableJob, jid: jid)
+    assert_equal (10..20).to_a, ArrayIterableJob.iterated_objects
+  end
+
+  it "calls iteration hooks" do
+    jid = iterate_exact_times(ArrayIterableJob, 2)
+
+    assert_equal 1, ArrayIterableJob.on_start_called
+    assert_equal 2, ArrayIterableJob.around_iteration_called
+    assert_equal 0, ArrayIterableJob.on_resume_called
+    assert_equal 1, ArrayIterableJob.on_stop_called
+    assert_equal 0, ArrayIterableJob.on_complete_called
+
+    iterate_exact_times(ArrayIterableJob, 2, jid: jid)
+
+    assert_equal 1, ArrayIterableJob.on_start_called
+    assert_equal 4, ArrayIterableJob.around_iteration_called
+    assert_equal 1, ArrayIterableJob.on_resume_called
+    assert_equal 2, ArrayIterableJob.on_stop_called
+    assert_equal 0, ArrayIterableJob.on_complete_called
+
+    continue_iterating(ArrayIterableJob, jid: jid)
+
+    assert_equal 1, ArrayIterableJob.on_start_called
+    assert_equal 11, ArrayIterableJob.around_iteration_called
+    assert_equal 2, ArrayIterableJob.on_resume_called
+    assert_equal 3, ArrayIterableJob.on_stop_called
+    assert_equal 1, ArrayIterableJob.on_complete_called
+  end
+
+  it "reschedules itself when sidekiq is stopping" do
+    jid = iterate_exact_times(ArrayIterableJob, 2)
+
+    assert_equal [10, 11], ArrayIterableJob.iterated_objects
+
+    @context.expect(:stopping?, true) do
+      iterate_exact_times(ArrayIterableJob, 2, jid: jid)
+      assert_equal [10, 11, 11], ArrayIterableJob.iterated_objects
+    end
+
+    continue_iterating(ArrayIterableJob, jid: jid)
+    assert_equal (10..20).to_a, ArrayIterableJob.iterated_objects.uniq
+  end
+
+  private
+
+  def iterate_exact_times(job, count, jid: nil)
+    job.stop_after_iterations = count
+    if jid
+      job.set(jid: jid).perform_async
+    else
+      jid = job.perform_async
+    end
+
+    begin
+      j = job.new
+      j.jid = jid
+
+      hash = {"class" => job.name, "retry" => true, "args" => []}
+      hash["jid"] = jid if jid
+      handler.call(j, hash, "default") do
+        j.perform
+      end
+    rescue Sidekiq::JobRetry::Skip
+    end
+
+    jid
+  end
+
+  def continue_iterating(job, jid:)
+    job.stop_after_iterations = nil
+    job.set(jid: jid).perform_async
+    job.perform_one
+  end
+
+  def handler
+    @handler ||= begin
+      ih = Sidekiq::Job::InterruptHandler.new
+      ih.config = @config
+      ih
+    end
+  end
+
+  def fetch_iteration_state(jid)
+    @config.redis { |conn| conn.hgetall("it-#{jid}") }
+  end
+end
diff --git a/vendor/gems/sidekiq-7.2.4/test/job_generator_test.rb b/vendor/gems/sidekiq/test/job_generator_test.rb
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/test/job_generator_test.rb
rename to vendor/gems/sidekiq/test/job_generator_test.rb
diff --git a/vendor/gems/sidekiq-7.2.4/test/job_logger_test.rb b/vendor/gems/sidekiq/test/job_logger_test.rb
similarity index 81%
rename from vendor/gems/sidekiq-7.2.4/test/job_logger_test.rb
rename to vendor/gems/sidekiq/test/job_logger_test.rb
index f040143b3b3..bb45ae98884 100644
--- a/vendor/gems/sidekiq-7.2.4/test/job_logger_test.rb
+++ b/vendor/gems/sidekiq/test/job_logger_test.rb
@@ -21,8 +21,24 @@ describe "Job logger" do
     Thread.current[:sidekiq_tid] = nil
   end
 
+  it "allows output to be disabled" do
+    @logger.formatter = Sidekiq::Logger::Formatters::Pretty.new
+    @cfg[:skip_default_job_logging] = true
+
+    jl = Sidekiq::JobLogger.new(@cfg)
+    @logger.info "mike"
+    job = {"jid" => "1234abc", "wrapped" => "FooJob", "class" => "Wrapper", "tags" => ["bar", "baz"]}
+    jl.prepare(job) do
+      jl.call(job, "queue") {}
+    end
+
+    a, b = @output.string.lines
+    assert_match(/mike/, a)
+    refute b
+  end
+
   it "tests pretty output" do
-    jl = Sidekiq::JobLogger.new(@logger)
+    jl = Sidekiq::JobLogger.new(@cfg)
 
     # pretty
     p = @logger.formatter = Sidekiq::Logger::Formatters::Pretty.new
@@ -45,7 +61,7 @@ describe "Job logger" do
   it "tests json output" do
     # json
     @logger.formatter = Sidekiq::Logger::Formatters::JSON.new
-    jl = Sidekiq::JobLogger.new(@logger)
+    jl = Sidekiq::JobLogger.new(@cfg)
     job = {"jid" => "1234abc", "wrapped" => "Wrapper", "class" => "FooJob", "bid" => "b-xyz", "tags" => ["bar", "baz"]}
     # this mocks what Processor does
     jl.prepare(job) do
@@ -62,7 +78,7 @@ describe "Job logger" do
   end
 
   it "tests custom log level" do
-    jl = Sidekiq::JobLogger.new(@logger)
+    jl = Sidekiq::JobLogger.new(@cfg)
     job = {"class" => "FooJob", "log_level" => "debug"}
 
     assert @logger.info?
@@ -84,7 +100,7 @@ describe "Job logger" do
     @logger = Logger.new(@output, level: :info)
     @cfg.logger = @logger
 
-    jl = Sidekiq::JobLogger.new(@logger)
+    jl = Sidekiq::JobLogger.new(@cfg)
     job = {"class" => "FooJob", "log_level" => "debug"}
 
     assert @logger.info?
diff --git a/vendor/gems/sidekiq-7.2.4/test/job_test.rb b/vendor/gems/sidekiq/test/job_test.rb
similarity index 85%
rename from vendor/gems/sidekiq-7.2.4/test/job_test.rb
rename to vendor/gems/sidekiq/test/job_test.rb
index 6bfa8159d3c..5e4e11fabdc 100644
--- a/vendor/gems/sidekiq-7.2.4/test/job_test.rb
+++ b/vendor/gems/sidekiq/test/job_test.rb
@@ -12,6 +12,25 @@ class MySetJob
   end
 end
 
+class Stopper
+  attr_accessor :_stopping
+  def stopping?
+    @_stopping
+  end
+end
+
+class ForeverJob
+  include Sidekiq::Job
+
+  def perform
+    count = 0
+    until count > 1000 && interrupted?
+      count += 1
+    end
+    count
+  end
+end
+
 class MyCustomJob
   include Sidekiq::Job
 
@@ -110,6 +129,24 @@ describe Sidekiq::Job do
       assert_equal "xyz", job["bar"]
     end
 
+    it "can detect when stopping" do
+      refute MySetJob.new.interrupted?
+    end
+
+    it "stops on command" do
+      stop = Stopper.new
+      stop._stopping = false
+      t = Thread.new do
+        job = ForeverJob.new
+        job._context = stop
+        job.perform
+      end
+      Thread.pass
+      stop._stopping = true
+      result = t.value
+      assert_operator 1000, :<=, result
+    end
+
     it "works with .perform_bulk" do
       q = Sidekiq::Queue.new("bar")
       assert_equal 0, q.size
diff --git a/vendor/gems/sidekiq-7.2.4/test/launcher_test.rb b/vendor/gems/sidekiq/test/launcher_test.rb
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/test/launcher_test.rb
rename to vendor/gems/sidekiq/test/launcher_test.rb
diff --git a/vendor/gems/sidekiq-7.2.4/test/logger_test.rb b/vendor/gems/sidekiq/test/logger_test.rb
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/test/logger_test.rb
rename to vendor/gems/sidekiq/test/logger_test.rb
diff --git a/vendor/gems/sidekiq-7.2.4/test/manager_test.rb b/vendor/gems/sidekiq/test/manager_test.rb
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/test/manager_test.rb
rename to vendor/gems/sidekiq/test/manager_test.rb
diff --git a/vendor/gems/sidekiq-7.2.4/test/metrics_test.rb b/vendor/gems/sidekiq/test/metrics_test.rb
similarity index 89%
rename from vendor/gems/sidekiq-7.2.4/test/metrics_test.rb
rename to vendor/gems/sidekiq/test/metrics_test.rb
index 78fce29b14a..acccee4808b 100644
--- a/vendor/gems/sidekiq-7.2.4/test/metrics_test.rb
+++ b/vendor/gems/sidekiq/test/metrics_test.rb
@@ -4,6 +4,7 @@ require_relative "helper"
 require "sidekiq/component"
 require "sidekiq/metrics/tracking"
 require "sidekiq/metrics/query"
+require "sidekiq/job_retry"
 require "sidekiq/deploy"
 require "sidekiq/api"
 
@@ -27,7 +28,7 @@ describe Sidekiq::Metrics do
     end
     smet.flush(time)
     smet.track("critical", "App::FooJob") { sleep 0.001 }
-    smet.track("critical", "App::FooJob") { sleep 0.025 }
+    smet.track("critical", "App::FooJob") { sleep 0.020 }
     smet.track("critical", "App::FooJob") { sleep 0.001 }
     smet.track("critical", "App::SomeJob") { sleep 0.001 }
     smet.flush(time - 60)
@@ -38,6 +39,24 @@ describe Sidekiq::Metrics do
     assert_equal 4, count
   end
 
+  it "does not track failures for interrupted iterable jobs" do
+    smet = Sidekiq::Metrics::ExecutionTracker.new(@config)
+    assert_raises Sidekiq::JobRetry::Skip do
+      smet.track("critical", "App::SomeJob") do
+        sleep 0.001
+        raise Sidekiq::JobRetry::Skip
+      end
+    end
+    smet.flush(fixed_time)
+
+    q = Sidekiq::Metrics::Query.new(now: fixed_time)
+    result = q.for_job("App::SomeJob")
+    job_result = result.job_results["App::SomeJob"]
+    refute_equal 0, job_result.totals["ms"]
+    assert_equal 1, job_result.totals["p"]
+    assert_equal 0, job_result.totals["f"]
+  end
+
   describe "marx" do
     it "owns the means of production" do
       whence = Time.local(2022, 7, 17, 18, 43, 15)
diff --git a/vendor/gems/sidekiq-7.2.4/test/middleware_test.rb b/vendor/gems/sidekiq/test/middleware_test.rb
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/test/middleware_test.rb
rename to vendor/gems/sidekiq/test/middleware_test.rb
diff --git a/vendor/gems/sidekiq-7.2.4/test/processor_test.rb b/vendor/gems/sidekiq/test/processor_test.rb
similarity index 94%
rename from vendor/gems/sidekiq-7.2.4/test/processor_test.rb
rename to vendor/gems/sidekiq/test/processor_test.rb
index f962eaeeeff..a7b975e17c4 100644
--- a/vendor/gems/sidekiq-7.2.4/test/processor_test.rb
+++ b/vendor/gems/sidekiq/test/processor_test.rb
@@ -18,6 +18,18 @@ class MockJob
   end
 end
 
+class MockIterableJob
+  include Sidekiq::IterableJob
+
+  def build_enumerator(cursor:)
+    array_enumerator((1..10).to_a, cursor: cursor)
+  end
+
+  def each_iteration(_number)
+    $invokes += 1
+  end
+end
+
 class ExceptionRaisingMiddleware
   def initialize(raise_before_yield, raise_after_yield, skip)
     @raise_before_yield = raise_before_yield
@@ -74,6 +86,12 @@ describe Sidekiq::Processor do
     assert_equal 1, $invokes
   end
 
+  it "processes iterable job as expected" do
+    msg = Sidekiq.dump_json({"class" => MockIterableJob.to_s})
+    @processor.process(work(msg))
+    assert_equal 10, $invokes
+  end
+
   it "executes a worker as expected" do
     worker = Minitest::Mock.new
     worker.expect(:perform, nil, [1, 2, 3])
@@ -301,27 +319,6 @@ describe Sidekiq::Processor do
     end
   end
 
-  describe "stats" do
-    before do
-      @config.redis { |c| c.flushdb }
-    end
-
-    describe "when successful" do
-      let(:processed_today_key) { "stat:processed:#{Time.now.utc.strftime("%Y-%m-%d")}" }
-
-      def successful_job
-        msg = Sidekiq.dump_json({"class" => MockJob.to_s, "args" => ["myarg"]})
-        @processor.process(work(msg))
-      end
-
-      it "increments processed stat" do
-        Sidekiq::Processor::PROCESSED.reset
-        successful_job
-        assert_equal 1, Sidekiq::Processor::PROCESSED.reset
-      end
-    end
-  end
-
   describe "stats" do
     before do
       @config.redis { |c| c.flushdb }
diff --git a/vendor/gems/sidekiq-7.2.4/test/rails_test.rb b/vendor/gems/sidekiq/test/rails_test.rb
similarity index 88%
rename from vendor/gems/sidekiq-7.2.4/test/rails_test.rb
rename to vendor/gems/sidekiq/test/rails_test.rb
index 951dbd5fb02..cb22408b3f9 100644
--- a/vendor/gems/sidekiq-7.2.4/test/rails_test.rb
+++ b/vendor/gems/sidekiq/test/rails_test.rb
@@ -7,11 +7,8 @@ require "sidekiq/api"
 
 describe "ActiveJob" do
   before do
-    @config = reset!
-    # need to force this since we aren't booting a Rails app
     ActiveJob::Base.queue_adapter = :sidekiq
-    ActiveJob::Base.logger = nil
-    ActiveJob::Base.send(:include, ::Sidekiq::Job::Options) unless ActiveJob::Base.respond_to?(:sidekiq_options)
+    @config = reset!
     @config[:backtrace_cleaner] = ->(backtrace) { Rails.backtrace_cleaner.clean(backtrace) }
   end
 
diff --git a/vendor/gems/sidekiq-7.2.4/test/redis_connection_test.rb b/vendor/gems/sidekiq/test/redis_connection_test.rb
similarity index 84%
rename from vendor/gems/sidekiq-7.2.4/test/redis_connection_test.rb
rename to vendor/gems/sidekiq/test/redis_connection_test.rb
index d0cfb3bd835..1766a02c39a 100644
--- a/vendor/gems/sidekiq-7.2.4/test/redis_connection_test.rb
+++ b/vendor/gems/sidekiq/test/redis_connection_test.rb
@@ -95,7 +95,7 @@ describe Sidekiq::RedisConnection do
       it "uses the default network_timeout if none specified" do
         pool = Sidekiq::RedisConnection.create
         redis = pool.checkout
-        assert_equal 1.0, client_for(redis).read_timeout
+        assert_equal 3.0, client_for(redis).read_timeout
       end
     end
 
@@ -172,6 +172,21 @@ describe Sidekiq::RedisConnection do
         assert_includes(output, ':password=>"REDACTED"')
       end
 
+      it "supports sentinel urls" do
+        options = {
+          url: "rediss://user:secret@mymaster",
+          sentinels: ["rediss://sentinel-user:secret@sentinel-host:26379"]
+        }
+
+        output = capture_logging(@config) do |logger|
+          Sidekiq::RedisConnection.create(options.merge(logger: logger))
+        end
+
+        refute_includes(options.inspect, "REDACTED")
+        refute_includes(output, "secret")
+        assert_includes(output, "sentinel-user:REDACTED@sentinel-host:26379")
+      end
+
       it "prunes SSL parameters from the logging" do
         output = capture_logging(@config) do |logger|
           options = {
@@ -187,6 +202,26 @@ describe Sidekiq::RedisConnection do
         refute_includes(output, "ssl_params")
       end
     end
+
+    it "symbolizes redis options keys" do
+      options = {
+        "name" => "mymaster",
+        "sentinels" => [
+          {"host" => "host1", "port" => 26379, "password" => "secret"},
+          {"host" => "host2", "port" => 26379, "password" => "secret"},
+          {"host" => "host3", "port" => 26379, "password" => "secret"}
+        ]
+      }
+
+      pool = Sidekiq::RedisConnection.create(options)
+      config = config_for(pool.checkout)
+
+      config.sentinels.each.with_index do |sentinel_config, idx|
+        assert_equal options["sentinels"][idx]["host"], sentinel_config.host
+        assert_equal options["sentinels"][idx]["port"], sentinel_config.port
+        assert_equal options["sentinels"][idx]["password"], sentinel_config.password
+      end
+    end
   end
 
   describe ".determine_redis_provider" do
diff --git a/vendor/gems/sidekiq-7.2.4/test/retry_exhausted_test.rb b/vendor/gems/sidekiq/test/retry_exhausted_test.rb
similarity index 99%
rename from vendor/gems/sidekiq-7.2.4/test/retry_exhausted_test.rb
rename to vendor/gems/sidekiq/test/retry_exhausted_test.rb
index c32fbec33dc..1b03afb9c6c 100644
--- a/vendor/gems/sidekiq-7.2.4/test/retry_exhausted_test.rb
+++ b/vendor/gems/sidekiq/test/retry_exhausted_test.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative "helper"
 require "sidekiq/job_retry"
 require "sidekiq/capsule"
diff --git a/vendor/gems/sidekiq-7.2.4/test/retry_test.rb b/vendor/gems/sidekiq/test/retry_test.rb
similarity index 99%
rename from vendor/gems/sidekiq-7.2.4/test/retry_test.rb
rename to vendor/gems/sidekiq/test/retry_test.rb
index 41979eda618..c6ffd74f6a4 100644
--- a/vendor/gems/sidekiq-7.2.4/test/retry_test.rb
+++ b/vendor/gems/sidekiq/test/retry_test.rb
@@ -408,7 +408,7 @@ describe Sidekiq::JobRetry do
       it "kills when configured on special exceptions" do
         ds = Sidekiq::DeadSet.new
         assert_equal 0, ds.size
-        assert_raises Sidekiq::JobRetry::Skip do
+        assert_raises Sidekiq::JobRetry::Handled do
           handler.local(CustomJobWithException, jobstr({"class" => "CustomJobWithException"}), "default") do
             raise "oops"
           end
diff --git a/vendor/gems/sidekiq-7.2.4/test/scheduled_test.rb b/vendor/gems/sidekiq/test/scheduled_test.rb
similarity index 98%
rename from vendor/gems/sidekiq-7.2.4/test/scheduled_test.rb
rename to vendor/gems/sidekiq/test/scheduled_test.rb
index a0c94681ef5..a1aa4165a51 100644
--- a/vendor/gems/sidekiq-7.2.4/test/scheduled_test.rb
+++ b/vendor/gems/sidekiq/test/scheduled_test.rb
@@ -121,7 +121,7 @@ describe Sidekiq::Scheduled do
 
         assert intervals.all? { |x| x >= 5 }
         assert intervals.all? { |x| x <= 15 }
-        assert_in_delta 10, intervals.sum.to_f / i, 0.5
+        assert_in_delta 10, intervals.sum.to_f / i, 0.51
       end
     end
 
diff --git a/vendor/gems/sidekiq-7.2.4/test/scheduling_test.rb b/vendor/gems/sidekiq/test/scheduling_test.rb
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/test/scheduling_test.rb
rename to vendor/gems/sidekiq/test/scheduling_test.rb
diff --git a/vendor/gems/sidekiq-7.2.4/test/sharding_test.rb b/vendor/gems/sidekiq/test/sharding_test.rb
similarity index 97%
rename from vendor/gems/sidekiq-7.2.4/test/sharding_test.rb
rename to vendor/gems/sidekiq/test/sharding_test.rb
index ca01b7ea2f0..3a941611ce0 100644
--- a/vendor/gems/sidekiq-7.2.4/test/sharding_test.rb
+++ b/vendor/gems/sidekiq/test/sharding_test.rb
@@ -23,7 +23,9 @@ describe "Sharding" do
   before do
     @config = reset!
     @sh1 = Sidekiq::RedisConnection.create(size: 1, db: 6)
+    @sh1.with { |c| c.flushdb }
     @sh2 = Sidekiq::RedisConnection.create(size: 1, db: 5)
+    @sh2.with { |c| c.flushdb }
   end
 
   after do
diff --git a/vendor/gems/sidekiq-7.2.4/test/sidekiq_test.rb b/vendor/gems/sidekiq/test/sidekiq_test.rb
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/test/sidekiq_test.rb
rename to vendor/gems/sidekiq/test/sidekiq_test.rb
diff --git a/vendor/gems/sidekiq-7.2.4/test/sidekiqmon_test.rb b/vendor/gems/sidekiq/test/sidekiqmon_test.rb
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/test/sidekiqmon_test.rb
rename to vendor/gems/sidekiq/test/sidekiqmon_test.rb
diff --git a/vendor/gems/sidekiq-7.2.4/test/systemd_test.rb b/vendor/gems/sidekiq/test/systemd_test.rb
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/test/systemd_test.rb
rename to vendor/gems/sidekiq/test/systemd_test.rb
diff --git a/vendor/gems/sidekiq-7.2.4/test/testing_fake_test.rb b/vendor/gems/sidekiq/test/testing_fake_test.rb
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/test/testing_fake_test.rb
rename to vendor/gems/sidekiq/test/testing_fake_test.rb
diff --git a/vendor/gems/sidekiq-7.2.4/test/testing_inline_test.rb b/vendor/gems/sidekiq/test/testing_inline_test.rb
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/test/testing_inline_test.rb
rename to vendor/gems/sidekiq/test/testing_inline_test.rb
diff --git a/vendor/gems/sidekiq-7.2.4/test/testing_test.rb b/vendor/gems/sidekiq/test/testing_test.rb
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/test/testing_test.rb
rename to vendor/gems/sidekiq/test/testing_test.rb
diff --git a/vendor/gems/sidekiq-7.2.4/test/transaction_aware_client_test.rb b/vendor/gems/sidekiq/test/transaction_aware_client_test.rb
similarity index 94%
rename from vendor/gems/sidekiq-7.2.4/test/transaction_aware_client_test.rb
rename to vendor/gems/sidekiq/test/transaction_aware_client_test.rb
index 4f86b940d4c..407fa3ccac8 100644
--- a/vendor/gems/sidekiq-7.2.4/test/transaction_aware_client_test.rb
+++ b/vendor/gems/sidekiq/test/transaction_aware_client_test.rb
@@ -7,15 +7,6 @@ require "sidekiq/transaction_aware_client"
 
 require_relative "dummy/config/environment"
 
-class Schema < ActiveRecord::Migration["6.1"]
-  def change
-    create_table :posts do |t|
-      t.string :title
-      t.date :published_date
-    end
-  end
-end
-
 class PostJob
   include Sidekiq::Job
   def perform
@@ -46,11 +37,14 @@ class Post < ActiveRecord::Base
   end
 end
 
-unless Post.connection.tables.include? "posts"
-  Schema.new.change
-end
-
 describe Sidekiq::TransactionAwareClient do
+  before(:all) do
+    Post.connection.create_table(:posts, force: true) do |t|
+      t.string :title
+      t.date :published_date
+    end
+  end
+
   before do
     @config = reset!
     @app = Dummy::Application.new
diff --git a/vendor/gems/sidekiq-7.2.4/test/web_helpers_test.rb b/vendor/gems/sidekiq/test/web_helpers_test.rb
similarity index 90%
rename from vendor/gems/sidekiq-7.2.4/test/web_helpers_test.rb
rename to vendor/gems/sidekiq/test/web_helpers_test.rb
index eeade6a44e5..f5d6dfa2543 100644
--- a/vendor/gems/sidekiq-7.2.4/test/web_helpers_test.rb
+++ b/vendor/gems/sidekiq/test/web_helpers_test.rb
@@ -30,6 +30,10 @@ class Helpers
     {}
   end
 
+  def session
+    {}
+  end
+
   def path_info
     @thehash[:path_info]
   end
@@ -40,6 +44,16 @@ describe "Web helpers" do
     Sidekiq.redis { |c| c.flushdb }
   end
 
+  it "tests script_tag" do
+    obj = Helpers.new
+    assert_equal '<script type="text/javascript" src="/sidekiq.js"></script>', obj.script_tag("sidekiq.js")
+  end
+
+  it "tests style_tag" do
+    obj = Helpers.new
+    assert_equal '<link type="text/css" media="screen" rel="stylesheet" href="/sidekiq.css" />', obj.style_tag("sidekiq.css")
+  end
+
   it "tests locale determination" do
     obj = Helpers.new
     assert_equal "en", obj.locale
@@ -96,15 +110,23 @@ describe "Web helpers" do
     assert_equal "en", obj.locale
   end
 
-  it "tests user selected locale" do
+  it "handles invalid locales" do
     obj = Helpers.new("HTTP_ACCEPT_LANGUAGE" => "*")
+    obj.instance_eval do
+      def session
+        {locale: "xx"}
+      end
+    end
+    assert_equal "en", obj.locale
+  end
 
+  it "uses the user selected locale" do
+    obj = Helpers.new("HTTP_ACCEPT_LANGUAGE" => "*")
     obj.instance_eval do
       def session
         {locale: "es"}
       end
     end
-
     assert_equal "es", obj.locale
   end
 
@@ -112,7 +134,7 @@ describe "Web helpers" do
     obj = Helpers.new
     expected = %w[
       ar cs da de el en es fa fr gd he hi it ja
-      ko lt nb nl pl pt pt-br ru sv ta uk ur
+      ko lt nb nl pl pt pt-br ru sv ta tr uk ur
       vi zh-cn zh-tw
     ]
     assert_equal expected, obj.available_locales.sort
diff --git a/vendor/gems/sidekiq-7.2.4/test/web_test.rb b/vendor/gems/sidekiq/test/web_test.rb
similarity index 95%
rename from vendor/gems/sidekiq-7.2.4/test/web_test.rb
rename to vendor/gems/sidekiq/test/web_test.rb
index dc3ad82a185..17d0c7fc19c 100644
--- a/vendor/gems/sidekiq-7.2.4/test/web_test.rb
+++ b/vendor/gems/sidekiq/test/web_test.rb
@@ -35,6 +35,7 @@ describe Sidekiq::Web do
   before do
     @config = reset!
     app.middlewares.clear
+    app.use Rack::Session::Cookie, secrets: "35c5108120cb479eecb4e947e423cad6da6f38327cf0ebb323e30816d74fa01f"
   end
 
   it "passes on unexpected methods" do
@@ -69,8 +70,9 @@ describe Sidekiq::Web do
     policies = last_response.headers["Content-Security-Policy"].split("; ")
     assert_includes(policies, "connect-src 'self' https: http: wss: ws:")
     assert_includes(policies, "style-src 'self' https: http: 'unsafe-inline'")
-    assert_includes(policies, "script-src 'self' https: http:")
+    assert_includes(policies, "script-src 'self' 'nonce-#{last_request.env[:csp_nonce]}'")
     assert_includes(policies, "object-src 'none'")
+    assert_operator(24, :>=, last_request.env[:csp_nonce].length)
   end
 
   it "provides a cheap HEAD response" do
@@ -148,9 +150,12 @@ describe Sidekiq::Web do
   end
 
   it "can display queues" do
-    assert Sidekiq::Client.push("queue" => :foo, "class" => WebJob, "args" => [1, 3])
+    Time.stub(:now, Time.now) do
+      assert Sidekiq::Client.push("queue" => :foo, "class" => WebJob, "args" => [1, 3])
+
+      get "/queues"
+    end
 
-    get "/queues"
     assert_equal 200, last_response.status
     assert_match(/foo/, last_response.body)
     refute_match(/HardJob/, last_response.body)
@@ -211,7 +216,7 @@ describe Sidekiq::Web do
     assert_equal 302, last_response.status
 
     @config.redis do |conn|
-      refute conn.smembers("queues").include?("foo")
+      refute_includes conn.smembers("queues"), "foo"
       refute(conn.exists("queue:foo") > 0)
     end
   end
@@ -302,7 +307,7 @@ describe Sidekiq::Web do
     assert_equal 302, last_response.status
 
     @config.redis do |conn|
-      refute conn.lrange("queue:foo", 0, -1).include?("{\"foo\":\"bar\"}")
+      refute_includes conn.lrange("queue:foo", 0, -1), "{\"foo\":\"bar\"}"
     end
   end
 
@@ -554,11 +559,11 @@ describe Sidekiq::Web do
     assert_equal 200, last_response.status
     assert_match(/FailJob/, last_response.body)
 
-    assert last_response.body.include?("fail message: &lt;a&gt;hello&lt;/a&gt;")
-    assert !last_response.body.include?("fail message: <a>hello</a>")
+    assert_includes last_response.body, "fail message: &lt;a&gt;hello&lt;/a&gt;"
+    refute_includes last_response.body, "fail message: <a>hello</a>"
 
-    assert last_response.body.include?("args\">&quot;&lt;a&gt;hello&lt;/a&gt;&quot;<")
-    assert !last_response.body.include?("args\"><a>hello</a><")
+    assert_includes last_response.body, "args\">&quot;&lt;a&gt;hello&lt;/a&gt;&quot;<"
+    refute_includes last_response.body, "args\"><a>hello</a><"
 
     # on /workers page
     @config.redis do |conn|
@@ -575,8 +580,8 @@ describe Sidekiq::Web do
     assert_equal 200, last_response.status
     assert_match(/FailJob/, last_response.body)
     assert_match(/frumduz/, last_response.body)
-    assert last_response.body.include?("&lt;a&gt;hello&lt;/a&gt;")
-    assert !last_response.body.include?("<a>hello</a>")
+    assert_includes last_response.body, "&lt;a&gt;hello&lt;/a&gt;"
+    refute_includes last_response.body, "<a>hello</a>"
 
     # on /queues page
     params = add_xss_retry # sorry, don't know how to easily make this show up on queues page otherwise.
@@ -585,8 +590,8 @@ describe Sidekiq::Web do
 
     get "/queues/foo"
     assert_equal 200, last_response.status
-    assert last_response.body.include?("&lt;a&gt;hello&lt;/a&gt;")
-    assert !last_response.body.include?("<a>hello</a>")
+    assert_includes last_response.body, "&lt;a&gt;hello&lt;/a&gt;"
+    refute_includes last_response.body, "<a>hello</a>"
   end
 
   it "can show user defined tab" do
@@ -607,10 +612,13 @@ describe Sidekiq::Web do
     session_data = {"rack.session" => {}}
     headers = {"HTTP_REFERER" => "http://example.org/path", "HTTP_BASE_URL" => "http://example.org/"}
 
+    post "/change_locale", {"locale" => "none"}, session_data.merge(headers)
+    assert_nil last_request.env["rack.session"][:locale]
+    assert_equal 302, last_response.status
+    assert_equal "http://example.org/path", last_response.location
+
     post "/change_locale", {"locale" => "es"}, session_data.merge(headers)
-
     assert_equal "es", last_request.env["rack.session"][:locale]
-
     assert_equal 302, last_response.status
     assert_equal "http://example.org/path", last_response.location
   end
diff --git a/vendor/gems/sidekiq-7.2.4/tmp/app/sidekiq/foo_job.rb b/vendor/gems/sidekiq/tmp/app/sidekiq/foo_job.rb
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/tmp/app/sidekiq/foo_job.rb
rename to vendor/gems/sidekiq/tmp/app/sidekiq/foo_job.rb
diff --git a/vendor/gems/sidekiq-7.2.4/web/assets/images/apple-touch-icon.png b/vendor/gems/sidekiq/web/assets/images/apple-touch-icon.png
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/web/assets/images/apple-touch-icon.png
rename to vendor/gems/sidekiq/web/assets/images/apple-touch-icon.png
diff --git a/vendor/gems/sidekiq-7.2.4/web/assets/images/favicon.ico b/vendor/gems/sidekiq/web/assets/images/favicon.ico
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/web/assets/images/favicon.ico
rename to vendor/gems/sidekiq/web/assets/images/favicon.ico
diff --git a/vendor/gems/sidekiq-7.2.4/web/assets/images/logo.png b/vendor/gems/sidekiq/web/assets/images/logo.png
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/web/assets/images/logo.png
rename to vendor/gems/sidekiq/web/assets/images/logo.png
diff --git a/vendor/gems/sidekiq-7.2.4/web/assets/images/status.png b/vendor/gems/sidekiq/web/assets/images/status.png
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/web/assets/images/status.png
rename to vendor/gems/sidekiq/web/assets/images/status.png
diff --git a/vendor/gems/sidekiq-7.2.4/web/assets/javascripts/application.js b/vendor/gems/sidekiq/web/assets/javascripts/application.js
similarity index 99%
rename from vendor/gems/sidekiq-7.2.4/web/assets/javascripts/application.js
rename to vendor/gems/sidekiq/web/assets/javascripts/application.js
index 01b175c1758..cd1744bb62f 100644
--- a/vendor/gems/sidekiq-7.2.4/web/assets/javascripts/application.js
+++ b/vendor/gems/sidekiq/web/assets/javascripts/application.js
@@ -34,6 +34,7 @@ function addListeners() {
   addShiftClickListeners()
   updateFuzzyTimes();
   updateNumbers();
+  updateProgressBars();
   setLivePollFromUrl();
 
   var buttons = document.querySelectorAll(".live-poll");
@@ -180,4 +181,8 @@ function showError(error) {
 
 function updateLocale(event) {
   event.target.form.submit();
-};
\ No newline at end of file
+}
+
+function updateProgressBars() {
+  document.querySelectorAll('.progress-bar').forEach(bar => { bar.style.width = bar.dataset.width + "%"})
+}
\ No newline at end of file
diff --git a/vendor/gems/sidekiq-7.2.4/web/assets/javascripts/base-charts.js b/vendor/gems/sidekiq/web/assets/javascripts/base-charts.js
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/web/assets/javascripts/base-charts.js
rename to vendor/gems/sidekiq/web/assets/javascripts/base-charts.js
diff --git a/vendor/gems/sidekiq-7.2.4/web/assets/javascripts/chart.min.js b/vendor/gems/sidekiq/web/assets/javascripts/chart.min.js
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/web/assets/javascripts/chart.min.js
rename to vendor/gems/sidekiq/web/assets/javascripts/chart.min.js
diff --git a/vendor/gems/sidekiq-7.2.4/web/assets/javascripts/chartjs-plugin-annotation.min.js b/vendor/gems/sidekiq/web/assets/javascripts/chartjs-plugin-annotation.min.js
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/web/assets/javascripts/chartjs-plugin-annotation.min.js
rename to vendor/gems/sidekiq/web/assets/javascripts/chartjs-plugin-annotation.min.js
diff --git a/vendor/gems/sidekiq-7.2.4/web/assets/javascripts/dashboard-charts.js b/vendor/gems/sidekiq/web/assets/javascripts/dashboard-charts.js
similarity index 86%
rename from vendor/gems/sidekiq-7.2.4/web/assets/javascripts/dashboard-charts.js
rename to vendor/gems/sidekiq/web/assets/javascripts/dashboard-charts.js
index 224f95af50f..b144dc8187a 100644
--- a/vendor/gems/sidekiq-7.2.4/web/assets/javascripts/dashboard-charts.js
+++ b/vendor/gems/sidekiq/web/assets/javascripts/dashboard-charts.js
@@ -108,17 +108,27 @@ class RealtimeChart extends DashboardChart {
   }
 
   renderLegend(dp) {
-    this.legend.innerHTML = `
-      <span>
-        <span class="swatch" style="background-color: ${dp[0].dataset.borderColor};"></span>
-        <span>${dp[0].dataset.label}: ${dp[0].formattedValue}</span>
-      </span>
-      <span>
-        <span class="swatch" style="background-color: ${dp[1].dataset.borderColor};"></span>
-        <span>${dp[1].dataset.label}: ${dp[1].formattedValue}</span>
-      </span>
-      <span class="time">${dp[0].label}</span>
-    `;
+    const entry1 = this.legendEntry(dp[0]);
+    const entry2 = this.legendEntry(dp[1]);
+    const time = document.createElement("span");
+    time.classList.add("time");
+    time.innerText = dp[0].label;
+
+    this.legend.replaceChildren(entry1, entry2, time)
+  }
+
+  legendEntry(dp) {
+    const wrapper = document.createElement("span");
+
+    const swatch = document.createElement("span");
+    swatch.classList.add("swatch");
+    swatch.style.backgroundColor = dp.dataset.borderColor;
+    wrapper.appendChild(swatch)
+    
+    const label = document.createElement("span");
+    label.innerText = `${dp.dataset.label}: ${dp.formattedValue}`;
+    wrapper.appendChild(label)
+    return wrapper;
   }
 
   renderCursor(dp) {
@@ -179,4 +189,4 @@ class RealtimeChart extends DashboardChart {
   if (hc != null) {
     var htc = new DashboardChart(hc, JSON.parse(hc.textContent))
     window.historyChart = htc
-  }
\ No newline at end of file
+  }
diff --git a/vendor/gems/sidekiq-7.2.4/web/assets/javascripts/dashboard.js b/vendor/gems/sidekiq/web/assets/javascripts/dashboard.js
similarity index 98%
rename from vendor/gems/sidekiq-7.2.4/web/assets/javascripts/dashboard.js
rename to vendor/gems/sidekiq/web/assets/javascripts/dashboard.js
index c6e582fcf9a..2d05bd19dea 100644
--- a/vendor/gems/sidekiq-7.2.4/web/assets/javascripts/dashboard.js
+++ b/vendor/gems/sidekiq/web/assets/javascripts/dashboard.js
@@ -28,7 +28,7 @@ var pulseBeacon = function() {
 }
 
 var setSliderLabel = function(val) {
-  document.getElementById('sldr-text').innerText = Math.round(parseFloat(val) / 1000) + ' sec';
+  document.getElementById('sldr-text').innerText = Math.round(parseFloat(val) / 1000) + ' s';
 }
 
 var ready = (callback) => {
diff --git a/vendor/gems/sidekiq-7.2.4/web/assets/javascripts/metrics.js b/vendor/gems/sidekiq/web/assets/javascripts/metrics.js
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/web/assets/javascripts/metrics.js
rename to vendor/gems/sidekiq/web/assets/javascripts/metrics.js
diff --git a/vendor/gems/sidekiq-7.2.4/web/assets/stylesheets/application-dark.css b/vendor/gems/sidekiq/web/assets/stylesheets/application-dark.css
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/web/assets/stylesheets/application-dark.css
rename to vendor/gems/sidekiq/web/assets/stylesheets/application-dark.css
diff --git a/vendor/gems/sidekiq-7.2.4/web/assets/stylesheets/application-rtl.css b/vendor/gems/sidekiq/web/assets/stylesheets/application-rtl.css
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/web/assets/stylesheets/application-rtl.css
rename to vendor/gems/sidekiq/web/assets/stylesheets/application-rtl.css
diff --git a/vendor/gems/sidekiq-7.2.4/web/assets/stylesheets/application.css b/vendor/gems/sidekiq/web/assets/stylesheets/application.css
similarity index 99%
rename from vendor/gems/sidekiq-7.2.4/web/assets/stylesheets/application.css
rename to vendor/gems/sidekiq/web/assets/stylesheets/application.css
index cb610479361..f347cedad2f 100644
--- a/vendor/gems/sidekiq-7.2.4/web/assets/stylesheets/application.css
+++ b/vendor/gems/sidekiq/web/assets/stylesheets/application.css
@@ -72,6 +72,14 @@ h1, h2, h3 {
   line-height: 45px;
 }
 
+.progress {
+  margin-bottom: 0;
+}
+
+.w-50 {
+  width: 50%;
+}
+
 .header-container, .header-container .page-title-container {
   display: flex;
   justify-content: space-between;
@@ -626,8 +634,12 @@ div.interval-slider input {
 .container {
   padding: 0;
 }
+.navbar-fixed-bottom {
+  position: relative;
+  top: auto;
+}
 @media (max-width: 767px) {
-  .navbar-fixed-top, .navbar-fixed-bottom {
+  .navbar-fixed-top {
     position: relative;
     top: auto;
   }
diff --git a/vendor/gems/sidekiq-7.2.4/web/assets/stylesheets/bootstrap-rtl.min.css b/vendor/gems/sidekiq/web/assets/stylesheets/bootstrap-rtl.min.css
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/web/assets/stylesheets/bootstrap-rtl.min.css
rename to vendor/gems/sidekiq/web/assets/stylesheets/bootstrap-rtl.min.css
diff --git a/vendor/gems/sidekiq-7.2.4/web/assets/stylesheets/bootstrap.css b/vendor/gems/sidekiq/web/assets/stylesheets/bootstrap.css
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/web/assets/stylesheets/bootstrap.css
rename to vendor/gems/sidekiq/web/assets/stylesheets/bootstrap.css
diff --git a/vendor/gems/sidekiq-7.2.4/web/locales/ar.yml b/vendor/gems/sidekiq/web/locales/ar.yml
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/web/locales/ar.yml
rename to vendor/gems/sidekiq/web/locales/ar.yml
diff --git a/vendor/gems/sidekiq-7.2.4/web/locales/cs.yml b/vendor/gems/sidekiq/web/locales/cs.yml
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/web/locales/cs.yml
rename to vendor/gems/sidekiq/web/locales/cs.yml
diff --git a/vendor/gems/sidekiq-7.2.4/web/locales/da.yml b/vendor/gems/sidekiq/web/locales/da.yml
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/web/locales/da.yml
rename to vendor/gems/sidekiq/web/locales/da.yml
diff --git a/vendor/gems/sidekiq-7.2.4/web/locales/de.yml b/vendor/gems/sidekiq/web/locales/de.yml
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/web/locales/de.yml
rename to vendor/gems/sidekiq/web/locales/de.yml
diff --git a/vendor/gems/sidekiq-7.2.4/web/locales/el.yml b/vendor/gems/sidekiq/web/locales/el.yml
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/web/locales/el.yml
rename to vendor/gems/sidekiq/web/locales/el.yml
diff --git a/vendor/gems/sidekiq-7.2.4/web/locales/en.yml b/vendor/gems/sidekiq/web/locales/en.yml
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/web/locales/en.yml
rename to vendor/gems/sidekiq/web/locales/en.yml
diff --git a/vendor/gems/sidekiq-7.2.4/web/locales/es.yml b/vendor/gems/sidekiq/web/locales/es.yml
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/web/locales/es.yml
rename to vendor/gems/sidekiq/web/locales/es.yml
diff --git a/vendor/gems/sidekiq-7.2.4/web/locales/fa.yml b/vendor/gems/sidekiq/web/locales/fa.yml
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/web/locales/fa.yml
rename to vendor/gems/sidekiq/web/locales/fa.yml
diff --git a/vendor/gems/sidekiq-7.2.4/web/locales/fr.yml b/vendor/gems/sidekiq/web/locales/fr.yml
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/web/locales/fr.yml
rename to vendor/gems/sidekiq/web/locales/fr.yml
diff --git a/vendor/gems/sidekiq-7.2.4/web/locales/gd.yml b/vendor/gems/sidekiq/web/locales/gd.yml
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/web/locales/gd.yml
rename to vendor/gems/sidekiq/web/locales/gd.yml
diff --git a/vendor/gems/sidekiq-7.2.4/web/locales/he.yml b/vendor/gems/sidekiq/web/locales/he.yml
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/web/locales/he.yml
rename to vendor/gems/sidekiq/web/locales/he.yml
diff --git a/vendor/gems/sidekiq-7.2.4/web/locales/hi.yml b/vendor/gems/sidekiq/web/locales/hi.yml
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/web/locales/hi.yml
rename to vendor/gems/sidekiq/web/locales/hi.yml
diff --git a/vendor/gems/sidekiq-7.2.4/web/locales/it.yml b/vendor/gems/sidekiq/web/locales/it.yml
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/web/locales/it.yml
rename to vendor/gems/sidekiq/web/locales/it.yml
diff --git a/vendor/gems/sidekiq-7.2.4/web/locales/ja.yml b/vendor/gems/sidekiq/web/locales/ja.yml
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/web/locales/ja.yml
rename to vendor/gems/sidekiq/web/locales/ja.yml
diff --git a/vendor/gems/sidekiq-7.2.4/web/locales/ko.yml b/vendor/gems/sidekiq/web/locales/ko.yml
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/web/locales/ko.yml
rename to vendor/gems/sidekiq/web/locales/ko.yml
diff --git a/vendor/gems/sidekiq-7.2.4/web/locales/lt.yml b/vendor/gems/sidekiq/web/locales/lt.yml
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/web/locales/lt.yml
rename to vendor/gems/sidekiq/web/locales/lt.yml
diff --git a/vendor/gems/sidekiq-7.2.4/web/locales/nb.yml b/vendor/gems/sidekiq/web/locales/nb.yml
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/web/locales/nb.yml
rename to vendor/gems/sidekiq/web/locales/nb.yml
diff --git a/vendor/gems/sidekiq-7.2.4/web/locales/nl.yml b/vendor/gems/sidekiq/web/locales/nl.yml
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/web/locales/nl.yml
rename to vendor/gems/sidekiq/web/locales/nl.yml
diff --git a/vendor/gems/sidekiq-7.2.4/web/locales/pl.yml b/vendor/gems/sidekiq/web/locales/pl.yml
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/web/locales/pl.yml
rename to vendor/gems/sidekiq/web/locales/pl.yml
diff --git a/vendor/gems/sidekiq-7.2.4/web/locales/pt-br.yml b/vendor/gems/sidekiq/web/locales/pt-br.yml
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/web/locales/pt-br.yml
rename to vendor/gems/sidekiq/web/locales/pt-br.yml
diff --git a/vendor/gems/sidekiq-7.2.4/web/locales/pt.yml b/vendor/gems/sidekiq/web/locales/pt.yml
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/web/locales/pt.yml
rename to vendor/gems/sidekiq/web/locales/pt.yml
diff --git a/vendor/gems/sidekiq-7.2.4/web/locales/ru.yml b/vendor/gems/sidekiq/web/locales/ru.yml
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/web/locales/ru.yml
rename to vendor/gems/sidekiq/web/locales/ru.yml
diff --git a/vendor/gems/sidekiq-7.2.4/web/locales/sv.yml b/vendor/gems/sidekiq/web/locales/sv.yml
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/web/locales/sv.yml
rename to vendor/gems/sidekiq/web/locales/sv.yml
diff --git a/vendor/gems/sidekiq-7.2.4/web/locales/ta.yml b/vendor/gems/sidekiq/web/locales/ta.yml
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/web/locales/ta.yml
rename to vendor/gems/sidekiq/web/locales/ta.yml
diff --git a/vendor/gems/sidekiq/web/locales/tr.yml b/vendor/gems/sidekiq/web/locales/tr.yml
new file mode 100644
index 00000000000..2ca03b10eb2
--- /dev/null
+++ b/vendor/gems/sidekiq/web/locales/tr.yml
@@ -0,0 +1,101 @@
+# elements like %{queue} are variables and should not be translated
+tr:
+  Actions: Eylemler
+  AddToQueue: Kuyruğa ekle
+  AreYouSure: Emin misiniz?
+  AreYouSureDeleteJob: Bu işi silmek istediğinizden emin misiniz?
+  AreYouSureDeleteQueue: "%{queue} kuyruğunu silmek istediğinizden emin misiniz?"
+  Arguments: Argümanlar
+  BackToApp: Uygulamaya geri dön
+  Busy: Meşgul
+  Class: Sınıf
+  Connections: Bağlantılar
+  CreatedAt: Oluşturulma Tarihi
+  CurrentMessagesInQueue: Şu anki işler <span class='title'>%{queue}</span>
+  Dashboard: Gösterge Paneli
+  Dead: Ölü
+  DeadJobs: Ölü İşler
+  Delete: Sil
+  DeleteAll: Hepsini Sil
+  Deploy: Dağıt
+  Enqueued: Kuyruğa Alındı
+  Error: Hata
+  ErrorBacktrace: Hata Geri İzleme
+  ErrorClass: Hata Sınıfı
+  ErrorMessage: Hata Mesajı
+  ExecutionTime: Yürütme Süresi
+  Extras: Ekstralar
+  Failed: Başarısız
+  Failures: Başarısızlıklar
+  Failure: Başarısızlık
+  GoBack: ← Geri Dön
+  History: Geçmiş
+  Job: İş
+  Jobs: İşler
+  Kill: Sonlandır
+  KillAll: Hepsini Sonlandır
+  LastRetry: Son Yeniden Deneme
+  Latency: Gecikme
+  LivePoll: Canlı Anket
+  MemoryUsage: Bellek Kullanımı
+  Name: İsim
+  Namespace: Ad Alanı
+  NextRetry: Bir Sonraki Yeniden Deneme
+  NoDeadJobsFound: Ölü iş bulunamadı
+  NoRetriesFound: Yeniden deneme bulunamadı
+  NoScheduledFound: Zamanlanmış iş bulunamadı
+  NotYetEnqueued: Henüz kuyruğa alınmadı
+  OneMonth: 1 ay
+  OneWeek: 1 hafta
+  OriginallyFailed: İlk Başarısızlık
+  Pause: Duraklat
+  Paused: Duraklatıldı
+  PeakMemoryUsage: Maksimum Bellek Kullanımı
+  Plugins: Eklentiler
+  PollingInterval: Anket Aralığı
+  Process: Süreç
+  Processed: İşlendi
+  Processes: Süreçler
+  Queue: Kuyruk
+  Queues: Kuyruklar
+  Quiet: Sessiz
+  QuietAll: Hepsini Sessiz Yap
+  Realtime: Gerçek Zamanlı
+  Retries: Yeniden Denemeler
+  RetryAll: Hepsini Yeniden Dene
+  RetryCount: Yeniden Deneme Sayısı
+  RetryNow: Şimdi Yeniden Dene
+  Scheduled: Zamanlanmış
+  ScheduledJobs: Zamanlanmış İşler
+  Seconds: Saniye
+  ShowAll: Hepsini Göster
+  SixMonths: 6 ay
+  Size: Boyut
+  Started: Başlatıldı
+  Status: Durum
+  Stop: Durdur
+  StopAll: Hepsini Durdur
+  StopPolling: Anketi Durdur
+  Success: Başarı
+  Summary: Özet
+  Thread: İplik
+  Threads: İplikler
+  ThreeMonths: 3 ay
+  Time: Zaman
+  Unpause: Duraklatmayı Kaldır
+  Uptime: Çalışma Süresi (gün)
+  Utilization: Kullanım
+  Version: Sürüm
+  When: Ne Zaman
+  Worker: İşçi
+  active: aktif
+  idle: boşta
+  Metrics: Metrikler
+  NoDataFound: Veri bulunamadı
+  TotalExecutionTime: Toplam Yürütme Süresi
+  AvgExecutionTime: Ortalama Yürütme Süresi
+  Context: Bağlam
+  Bucket: Kova
+  NoJobMetricsFound: Son iş metrikleri bulunamadı
+  Filter: Filtre
+  AnyJobContent: Herhangi bir iş içeriği
diff --git a/vendor/gems/sidekiq-7.2.4/web/locales/uk.yml b/vendor/gems/sidekiq/web/locales/uk.yml
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/web/locales/uk.yml
rename to vendor/gems/sidekiq/web/locales/uk.yml
diff --git a/vendor/gems/sidekiq-7.2.4/web/locales/ur.yml b/vendor/gems/sidekiq/web/locales/ur.yml
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/web/locales/ur.yml
rename to vendor/gems/sidekiq/web/locales/ur.yml
diff --git a/vendor/gems/sidekiq-7.2.4/web/locales/vi.yml b/vendor/gems/sidekiq/web/locales/vi.yml
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/web/locales/vi.yml
rename to vendor/gems/sidekiq/web/locales/vi.yml
diff --git a/vendor/gems/sidekiq-7.2.4/web/locales/zh-cn.yml b/vendor/gems/sidekiq/web/locales/zh-cn.yml
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/web/locales/zh-cn.yml
rename to vendor/gems/sidekiq/web/locales/zh-cn.yml
diff --git a/vendor/gems/sidekiq-7.2.4/web/locales/zh-tw.yml b/vendor/gems/sidekiq/web/locales/zh-tw.yml
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/web/locales/zh-tw.yml
rename to vendor/gems/sidekiq/web/locales/zh-tw.yml
diff --git a/vendor/gems/sidekiq-7.2.4/web/views/_footer.erb b/vendor/gems/sidekiq/web/views/_footer.erb
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/web/views/_footer.erb
rename to vendor/gems/sidekiq/web/views/_footer.erb
diff --git a/vendor/gems/sidekiq-7.2.4/web/views/_job_info.erb b/vendor/gems/sidekiq/web/views/_job_info.erb
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/web/views/_job_info.erb
rename to vendor/gems/sidekiq/web/views/_job_info.erb
diff --git a/vendor/gems/sidekiq-7.2.4/web/views/_metrics_period_select.erb b/vendor/gems/sidekiq/web/views/_metrics_period_select.erb
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/web/views/_metrics_period_select.erb
rename to vendor/gems/sidekiq/web/views/_metrics_period_select.erb
diff --git a/vendor/gems/sidekiq-7.2.4/web/views/_nav.erb b/vendor/gems/sidekiq/web/views/_nav.erb
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/web/views/_nav.erb
rename to vendor/gems/sidekiq/web/views/_nav.erb
diff --git a/vendor/gems/sidekiq-7.2.4/web/views/_paging.erb b/vendor/gems/sidekiq/web/views/_paging.erb
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/web/views/_paging.erb
rename to vendor/gems/sidekiq/web/views/_paging.erb
diff --git a/vendor/gems/sidekiq-7.2.4/web/views/_poll_link.erb b/vendor/gems/sidekiq/web/views/_poll_link.erb
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/web/views/_poll_link.erb
rename to vendor/gems/sidekiq/web/views/_poll_link.erb
diff --git a/vendor/gems/sidekiq-7.2.4/web/views/_status.erb b/vendor/gems/sidekiq/web/views/_status.erb
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/web/views/_status.erb
rename to vendor/gems/sidekiq/web/views/_status.erb
diff --git a/vendor/gems/sidekiq-7.2.4/web/views/_summary.erb b/vendor/gems/sidekiq/web/views/_summary.erb
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/web/views/_summary.erb
rename to vendor/gems/sidekiq/web/views/_summary.erb
diff --git a/vendor/gems/sidekiq-7.2.4/web/views/busy.erb b/vendor/gems/sidekiq/web/views/busy.erb
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/web/views/busy.erb
rename to vendor/gems/sidekiq/web/views/busy.erb
diff --git a/vendor/gems/sidekiq-7.2.4/web/views/dashboard.erb b/vendor/gems/sidekiq/web/views/dashboard.erb
similarity index 91%
rename from vendor/gems/sidekiq-7.2.4/web/views/dashboard.erb
rename to vendor/gems/sidekiq/web/views/dashboard.erb
index 1f440060592..7ec0594af8b 100644
--- a/vendor/gems/sidekiq-7.2.4/web/views/dashboard.erb
+++ b/vendor/gems/sidekiq/web/views/dashboard.erb
@@ -1,4 +1,4 @@
-<script type="text/javascript" src="<%= root_path %>javascripts/dashboard.js"></script>
+<script type="text/javascript" src="<%= root_path %>javascripts/dashboard.js" nonce="<%= csp_nonce %>"></script>
 <div class= "dashboard clearfix">
   <h3 >
     <%= t('Dashboard') %>
@@ -9,7 +9,7 @@
   </h3>
   <div class="interval-slider ltr">
     <span class="interval-slider-label"><%= t('PollingInterval') %>:</span>
-    <span id="sldr-text" class="current-interval">5 sec</span>
+    <span id="sldr-text" class="current-interval">5 s</span>
     <br/>
     <input id="sldr" type="range" min="2000" max="20000" step="1000" value="5000"/>
   </div>
@@ -99,7 +99,7 @@
   </div>
 </div>
 
-<script type="text/javascript" src="<%= root_path %>javascripts/chart.min.js"></script>
-<script type="text/javascript" src="<%= root_path %>javascripts/chartjs-plugin-annotation.min.js"></script>
-<script type="text/javascript" src="<%= root_path %>javascripts/base-charts.js"></script>
-<script type="text/javascript" src="<%= root_path %>javascripts/dashboard-charts.js"></script>
\ No newline at end of file
+<script type="text/javascript" src="<%= root_path %>javascripts/chart.min.js" nonce="<%= csp_nonce %>"></script>
+<script type="text/javascript" src="<%= root_path %>javascripts/chartjs-plugin-annotation.min.js" nonce="<%= csp_nonce %>"></script>
+<script type="text/javascript" src="<%= root_path %>javascripts/base-charts.js" nonce="<%= csp_nonce %>"></script>
+<script type="text/javascript" src="<%= root_path %>javascripts/dashboard-charts.js" nonce="<%= csp_nonce %>"></script>
diff --git a/vendor/gems/sidekiq-7.2.4/web/views/dead.erb b/vendor/gems/sidekiq/web/views/dead.erb
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/web/views/dead.erb
rename to vendor/gems/sidekiq/web/views/dead.erb
diff --git a/vendor/gems/sidekiq-7.2.4/web/views/filtering.erb b/vendor/gems/sidekiq/web/views/filtering.erb
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/web/views/filtering.erb
rename to vendor/gems/sidekiq/web/views/filtering.erb
diff --git a/vendor/gems/sidekiq-7.2.4/web/views/layout.erb b/vendor/gems/sidekiq/web/views/layout.erb
similarity index 77%
rename from vendor/gems/sidekiq-7.2.4/web/views/layout.erb
rename to vendor/gems/sidekiq/web/views/layout.erb
index 3cbe9c2b529..7342720eebd 100644
--- a/vendor/gems/sidekiq-7.2.4/web/views/layout.erb
+++ b/vendor/gems/sidekiq/web/views/layout.erb
@@ -5,20 +5,20 @@
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width,initial-scale=1.0" />
 
-    <link href="<%= root_path %>stylesheets/bootstrap.css" media="screen" rel="stylesheet" type="text/css" />
+    <link href="<%= root_path %>stylesheets/bootstrap.css" media="screen" rel="stylesheet" type="text/css" nonce="<%= csp_nonce %>" />
     <% if rtl? %>
-    <link href="<%= root_path %>stylesheets/bootstrap-rtl.min.css" media="screen" rel="stylesheet" type="text/css"/>
+    <link href="<%= root_path %>stylesheets/bootstrap-rtl.min.css" media="screen" rel="stylesheet" type="text/css" nonce="<%= csp_nonce %>"/>
     <% end %>
 
-    <link href="<%= root_path %>stylesheets/application.css" media="screen" rel="stylesheet" type="text/css" />
-    <link href="<%= root_path %>stylesheets/application-dark.css" media="screen and (prefers-color-scheme: dark)" rel="stylesheet" type="text/css" />
+    <link href="<%= root_path %>stylesheets/application.css" media="screen" rel="stylesheet" type="text/css" nonce="<%= csp_nonce %>" />
+    <link href="<%= root_path %>stylesheets/application-dark.css" media="screen and (prefers-color-scheme: dark)" rel="stylesheet" type="text/css" nonce="<%= csp_nonce %>" />
     <% if rtl? %>
-    <link href="<%= root_path %>stylesheets/application-rtl.css" media="screen" rel="stylesheet" type="text/css" />
+    <link href="<%= root_path %>stylesheets/application-rtl.css" media="screen" rel="stylesheet" type="text/css" nonce="<%= csp_nonce %>" />
     <% end %>
 
     <link rel="apple-touch-icon" href="<%= root_path %>images/apple-touch-icon.png">
     <link rel="shortcut icon" type="image/ico" href="<%= root_path %>images/favicon.ico" />
-    <script type="text/javascript" src="<%= root_path %>javascripts/application.js"></script>
+    <script type="text/javascript" src="<%= root_path %>javascripts/application.js" nonce="<%= csp_nonce %>"></script>
     <meta name="google" content="notranslate" />
     <%= display_custom_head %>
   </head>
diff --git a/vendor/gems/sidekiq-7.2.4/web/views/metrics.erb b/vendor/gems/sidekiq/web/views/metrics.erb
similarity index 94%
rename from vendor/gems/sidekiq-7.2.4/web/views/metrics.erb
rename to vendor/gems/sidekiq/web/views/metrics.erb
index 5eefa33ff2f..86726ff4b19 100644
--- a/vendor/gems/sidekiq-7.2.4/web/views/metrics.erb
+++ b/vendor/gems/sidekiq/web/views/metrics.erb
@@ -1,6 +1,6 @@
-<script type="text/javascript" src="<%= root_path %>javascripts/chart.min.js"></script>
-<script type="text/javascript" src="<%= root_path %>javascripts/chartjs-plugin-annotation.min.js"></script>
-<script type="text/javascript" src="<%= root_path %>javascripts/base-charts.js"></script>
+<script type="text/javascript" src="<%= root_path %>javascripts/chart.min.js" nonce="<%= csp_nonce %>"></script>
+<script type="text/javascript" src="<%= root_path %>javascripts/chartjs-plugin-annotation.min.js" nonce="<%= csp_nonce %>"></script>
+<script type="text/javascript" src="<%= root_path %>javascripts/base-charts.js" nonce="<%= csp_nonce %>"></script>
 
 <div class="header-container">
   <div class="page-title-container">
@@ -88,4 +88,4 @@
 
 <!--p><small>Data from <%= @query_result.starts_at %> to <%= @query_result.ends_at %></small></p-->
 
-<script type="text/javascript" src="<%= root_path %>javascripts/metrics.js"></script>
+<script type="text/javascript" src="<%= root_path %>javascripts/metrics.js" nonce="<%= csp_nonce %>"></script>
diff --git a/vendor/gems/sidekiq-7.2.4/web/views/metrics_for_job.erb b/vendor/gems/sidekiq/web/views/metrics_for_job.erb
similarity index 90%
rename from vendor/gems/sidekiq-7.2.4/web/views/metrics_for_job.erb
rename to vendor/gems/sidekiq/web/views/metrics_for_job.erb
index 80e8d27afbe..36706f7ebfd 100644
--- a/vendor/gems/sidekiq-7.2.4/web/views/metrics_for_job.erb
+++ b/vendor/gems/sidekiq/web/views/metrics_for_job.erb
@@ -1,6 +1,6 @@
-<script type="text/javascript" src="<%= root_path %>javascripts/chart.min.js"></script>
-<script type="text/javascript" src="<%= root_path %>javascripts/chartjs-plugin-annotation.min.js"></script>
-<script type="text/javascript" src="<%= root_path %>javascripts/base-charts.js"></script>
+<script type="text/javascript" src="<%= root_path %>javascripts/chart.min.js" nonce="<%= csp_nonce %>"></script>
+<script type="text/javascript" src="<%= root_path %>javascripts/chartjs-plugin-annotation.min.js" nonce="<%= csp_nonce %>"></script>
+<script type="text/javascript" src="<%= root_path %>javascripts/base-charts.js" nonce="<%= csp_nonce %>"></script>
 
 <%
   job_result = @query_result.job_results[@name]
@@ -56,4 +56,4 @@
   <div class="alert alert-success"><%= t('NoJobMetricsFound') %></div>
 <% end %>
 
-<script type="text/javascript" src="<%= root_path %>javascripts/metrics.js"></script>
\ No newline at end of file
+<script type="text/javascript" src="<%= root_path %>javascripts/metrics.js" nonce="<%= csp_nonce %>"></script>
diff --git a/vendor/gems/sidekiq-7.2.4/web/views/morgue.erb b/vendor/gems/sidekiq/web/views/morgue.erb
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/web/views/morgue.erb
rename to vendor/gems/sidekiq/web/views/morgue.erb
diff --git a/vendor/gems/sidekiq-7.2.4/web/views/queue.erb b/vendor/gems/sidekiq/web/views/queue.erb
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/web/views/queue.erb
rename to vendor/gems/sidekiq/web/views/queue.erb
diff --git a/vendor/gems/sidekiq-7.2.4/web/views/queues.erb b/vendor/gems/sidekiq/web/views/queues.erb
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/web/views/queues.erb
rename to vendor/gems/sidekiq/web/views/queues.erb
diff --git a/vendor/gems/sidekiq-7.2.4/web/views/retries.erb b/vendor/gems/sidekiq/web/views/retries.erb
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/web/views/retries.erb
rename to vendor/gems/sidekiq/web/views/retries.erb
diff --git a/vendor/gems/sidekiq-7.2.4/web/views/retry.erb b/vendor/gems/sidekiq/web/views/retry.erb
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/web/views/retry.erb
rename to vendor/gems/sidekiq/web/views/retry.erb
diff --git a/vendor/gems/sidekiq-7.2.4/web/views/scheduled.erb b/vendor/gems/sidekiq/web/views/scheduled.erb
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/web/views/scheduled.erb
rename to vendor/gems/sidekiq/web/views/scheduled.erb
diff --git a/vendor/gems/sidekiq-7.2.4/web/views/scheduled_job_info.erb b/vendor/gems/sidekiq/web/views/scheduled_job_info.erb
similarity index 100%
rename from vendor/gems/sidekiq-7.2.4/web/views/scheduled_job_info.erb
rename to vendor/gems/sidekiq/web/views/scheduled_job_info.erb