diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-06-07 10:46:56 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-06-07 10:46:56 +0000 |
| commit | 37dd19935b7fe6942670de41d0da55e6c1d339d5 (patch) | |
| tree | b364b3a159e1d70f9a51849fce2a4dd9eb19d3ad /app/controllers/admin | |
| parent | 19982333d741119b395ef97fc3cdf7153313fad9 (diff) | |
| parent | 1c59ba67a539e9ef7298b1c219123200eeb54b01 (diff) | |
| download | gitlab-ce-37dd19935b7fe6942670de41d0da55e6c1d339d5.tar.gz | |
Merge branch 'instrument-infra' into 'master'
Add Prometheus metrics endpoint and basic infrastructure to meter code
See merge request !11553
Diffstat (limited to 'app/controllers/admin')
| -rw-r--r-- | app/controllers/admin/application_settings_controller.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/controllers/admin/application_settings_controller.rb b/app/controllers/admin/application_settings_controller.rb index 152d7baad49..75fb19e815f 100644 --- a/app/controllers/admin/application_settings_controller.rb +++ b/app/controllers/admin/application_settings_controller.rb @@ -149,6 +149,7 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController :version_check_enabled, :terminal_max_session_time, :polling_interval_multiplier, + :prometheus_metrics_enabled, :usage_ping_enabled, disabled_oauth_sign_in_sources: [], |