Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-07-08 12:09:17 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-07-08 12:09:17 +0300
commit21341457a8c422d890a9ec30838b597dea565d62 (patch)
treeaa8aca2a9bce4e16936cc8d7b40aa1c79ca82e35 /app/helpers
parent0a319374e7784aa5c2d1c30dd832d2a0509edbab (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/helpers')
-rw-r--r--app/helpers/operations_helper.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/operations_helper.rb b/app/helpers/operations_helper.rb
index 7500f7b1ff4..419fdd521c2 100644
--- a/app/helpers/operations_helper.rb
+++ b/app/helpers/operations_helper.rb
@@ -17,7 +17,7 @@ module OperationsHelper
def alerts_settings_data
{
- 'prometheus_activated' => prometheus_service.activated?.to_s,
+ '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),