diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-27 09:09:01 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-27 09:09:01 +0000 |
commit | c72e5ebe9938d315ec598197873e71a80168d40a (patch) | |
tree | 439bf5c40aaf774e5a301825af517cb52726f450 /app/controllers/projects/settings/operations_controller.rb | |
parent | ffc43b862df32a590eae874bcbb11109b46dc8be (diff) | |
download | gitlab-ce-c72e5ebe9938d315ec598197873e71a80168d40a.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/projects/settings/operations_controller.rb')
-rw-r--r-- | app/controllers/projects/settings/operations_controller.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/app/controllers/projects/settings/operations_controller.rb b/app/controllers/projects/settings/operations_controller.rb index 12b4f9ac56c..164cd5b9384 100644 --- a/app/controllers/projects/settings/operations_controller.rb +++ b/app/controllers/projects/settings/operations_controller.rb @@ -8,6 +8,7 @@ module Projects helper_method :error_tracking_setting def show + render locals: { prometheus_service: prometheus_service } end def update @@ -28,6 +29,10 @@ module Projects private + def prometheus_service + project.find_or_initialize_service(::PrometheusService.to_param) + end + def render_update_response(result) respond_to do |format| format.html do |