diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-23 21:08:14 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-23 21:08:14 +0300 |
| commit | 5e555ebcf6ee2ce13e9956ae599fd811a79b4dbd (patch) | |
| tree | 6dd67e2f8f49b54e0fb1f266d1720f461393df59 /config | |
| parent | 3e53902ee13fc4e0bf3162c0c392dcfe1a0ede4b (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/zz_metrics.rb | 4 | ||||
| -rw-r--r-- | config/sidekiq_queues.yml | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/config/initializers/zz_metrics.rb b/config/initializers/zz_metrics.rb index 88469d2cdef..5e6c1abdda6 100644 --- a/config/initializers/zz_metrics.rb +++ b/config/initializers/zz_metrics.rb @@ -32,7 +32,9 @@ if Gitlab::Metrics.enabled? && !Rails.env.test? && !(Rails.env.development? && d config.middleware.insert_before Gitlab::Database::LoadBalancing::RackMiddleware, Gitlab::Metrics::RackMiddleware - config.middleware.use(Gitlab::Middleware::RailsQueueDuration) + config.middleware.insert_before Gitlab::Database::LoadBalancing::RackMiddleware, + Gitlab::Middleware::RailsQueueDuration + config.middleware.use(Gitlab::Metrics::ElasticsearchRackMiddleware) end diff --git a/config/sidekiq_queues.yml b/config/sidekiq_queues.yml index 11c232df4e0..fc75752061f 100644 --- a/config/sidekiq_queues.yml +++ b/config/sidekiq_queues.yml @@ -47,6 +47,8 @@ - 1 - - audit_events_user_impersonation_event_create - 1 +- - auth_saml_group_sync + - 1 - - authorized_keys - 2 - - authorized_project_update |