diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-07-25 15:08:22 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-07-25 15:08:22 +0300 |
| commit | 5540824ee0e41db48486e378f03051832f521da6 (patch) | |
| tree | 95138ba07fb4adbc503353ac3e47d65d565d70eb /config | |
| parent | acad0870f7fd0cfe163a9d3a248a4a3eb8ca343d (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
| -rw-r--r-- | config/feature_flags/development/jira_deployment_issue_keys.yml | 8 | ||||
| -rw-r--r-- | config/initializers/zz_metrics.rb | 3 |
2 files changed, 3 insertions, 8 deletions
diff --git a/config/feature_flags/development/jira_deployment_issue_keys.yml b/config/feature_flags/development/jira_deployment_issue_keys.yml deleted file mode 100644 index e2b9db8020d..00000000000 --- a/config/feature_flags/development/jira_deployment_issue_keys.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: jira_deployment_issue_keys -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/123455 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/415025 -milestone: '16.2' -type: development -group: group::import and integrate -default_enabled: true diff --git a/config/initializers/zz_metrics.rb b/config/initializers/zz_metrics.rb index 9074602a555..c277692e407 100644 --- a/config/initializers/zz_metrics.rb +++ b/config/initializers/zz_metrics.rb @@ -23,6 +23,9 @@ if Gitlab::Metrics.enabled? && Gitlab::Runtime.application? config.middleware.insert_before Gitlab::Database::LoadBalancing::RackMiddleware, Gitlab::Middleware::RailsQueueDuration + config.middleware.move_after Gitlab::Metrics::RackMiddleware, + Gitlab::EtagCaching::Middleware + config.middleware.use(Gitlab::Metrics::ElasticsearchRackMiddleware) end |