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-05-08 12:09:39 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-05-08 12:09:39 +0300
commit5bdbc604c8a08f827c3833e2c28ec0c299bb41fc (patch)
tree1fbf5e5dc3bff54d371baa15775371ebc8525f62 /app/helpers/projects
parent79ddf163588de2d9a7f1cc27262dc1a14503f619 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/helpers/projects')
-rw-r--r--app/helpers/projects/alert_management_helper.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/projects/alert_management_helper.rb b/app/helpers/projects/alert_management_helper.rb
index 17f5a400eec..b2bb32239aa 100644
--- a/app/helpers/projects/alert_management_helper.rb
+++ b/app/helpers/projects/alert_management_helper.rb
@@ -7,7 +7,7 @@ module Projects::AlertManagementHelper
'enable-alert-management-path' => edit_project_service_path(project, AlertsService),
'empty-alert-svg-path' => image_path('illustrations/alert-management-empty-state.svg'),
'user-can-enable-alert-management' => can?(current_user, :admin_project, project).to_s,
- 'alert-management-enabled' => Feature.enabled?(:alert_management_minimal, project).to_s
+ 'alert-management-enabled' => (!!project.alerts_service_activated?).to_s
}
end