From 8b573c94895dc0ac0e1d9d59cf3e8745e8b539ca Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 17 Dec 2020 11:59:07 +0000 Subject: Add latest changes from gitlab-org/gitlab@13-7-stable-ee --- app/helpers/operations_helper.rb | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'app/helpers/operations_helper.rb') diff --git a/app/helpers/operations_helper.rb b/app/helpers/operations_helper.rb index 8105fce10cf..6d721776f0d 100644 --- a/app/helpers/operations_helper.rb +++ b/app/helpers/operations_helper.rb @@ -9,24 +9,14 @@ module OperationsHelper end end - def alerts_service - strong_memoize(:alerts_service) do - @project.find_or_initialize_service(::AlertsService.to_param) - end - end - def alerts_settings_data(disabled: false) { 'prometheus_activated' => prometheus_service.manual_configuration?.to_s, - 'activated' => alerts_service.activated?.to_s, 'prometheus_form_path' => scoped_integration_path(prometheus_service), - 'form_path' => scoped_integration_path(alerts_service), 'prometheus_reset_key_path' => reset_alerting_token_project_settings_operations_path(@project), 'prometheus_authorization_key' => @project.alerting_setting&.token, 'prometheus_api_url' => prometheus_service.api_url, - 'authorization_key' => alerts_service.token, 'prometheus_url' => notify_project_prometheus_alerts_url(@project, format: :json), - 'url' => alerts_service.url, 'alerts_setup_url' => help_page_path('operations/incident_management/alert_integrations.md', anchor: 'generic-http-endpoint'), 'alerts_usage_url' => project_alert_management_index_path(@project), 'disabled' => disabled.to_s, -- cgit v1.2.3