From c72e5ebe9938d315ec598197873e71a80168d40a Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 27 Feb 2020 09:09:01 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/controllers/projects/settings/operations_controller.rb | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'app/controllers/projects/settings/operations_controller.rb') 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 -- cgit v1.2.1