diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-13 00:08:46 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-13 00:08:46 +0000 |
commit | 47d1f417f03aca055b2ba49c32bb6fb01c459831 (patch) | |
tree | 200f05f28369cbf3a34abcb4a3c388558268b86f /app/controllers/projects/settings | |
parent | 006e89697dd5165f355afc20fc6bb0cdfa7b381a (diff) | |
download | gitlab-ce-47d1f417f03aca055b2ba49c32bb6fb01c459831.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/projects/settings')
-rw-r--r-- | app/controllers/projects/settings/operations_controller.rb | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/app/controllers/projects/settings/operations_controller.rb b/app/controllers/projects/settings/operations_controller.rb index 1571cb8cd34..3817da8596b 100644 --- a/app/controllers/projects/settings/operations_controller.rb +++ b/app/controllers/projects/settings/operations_controller.rb @@ -60,7 +60,7 @@ module Projects # overridden in EE def permitted_project_params - { + project_params = { metrics_setting_attributes: [:external_dashboard_url], error_tracking_setting_attributes: [ @@ -72,6 +72,12 @@ module Projects grafana_integration_attributes: [:token, :grafana_url, :enabled] } + + if Feature.enabled?(:settings_operations_prometheus_service, project) + project_params[:prometheus_integration_attributes] = [:manual_configuration, :api_url] + end + + project_params end end end |