diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-03 00:06:22 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-03 00:06:22 +0300 |
| commit | 6d60f910762c1a92a07a4afaf1b26962f75ee4b6 (patch) | |
| tree | 0a9ef6ccb20aa2099df33a409723eb912f8029e3 /config | |
| parent | de2ae3154f4ba1c23eeaa4ace41177ecd9b6005a (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/0_inflections.rb | 1 | ||||
| -rw-r--r-- | config/initializers/7_prometheus_metrics.rb | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/config/initializers/0_inflections.rb b/config/initializers/0_inflections.rb index d317825c1b8..c0afa207ac3 100644 --- a/config/initializers/0_inflections.rb +++ b/config/initializers/0_inflections.rb @@ -20,6 +20,7 @@ ActiveSupport::Inflector.inflections do |inflect| file_registry job_artifact_registry container_repository_registry + design_registry vulnerability_feedback vulnerabilities_feedback group_view diff --git a/config/initializers/7_prometheus_metrics.rb b/config/initializers/7_prometheus_metrics.rb index 6bd2256ac0e..c55c14497b4 100644 --- a/config/initializers/7_prometheus_metrics.rb +++ b/config/initializers/7_prometheus_metrics.rb @@ -54,5 +54,7 @@ if !Rails.env.test? && Gitlab::Metrics.prometheus_metrics_enabled? elsif defined?(::Puma) Gitlab::Metrics::Samplers::PumaSampler.instance(Settings.monitoring.puma_sampler_interval).start end + + Gitlab::Metrics::RequestsRackMiddleware.initialize_http_request_duration_seconds end end |