From 5bdbc604c8a08f827c3833e2c28ec0c299bb41fc Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 8 May 2020 09:09:39 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/helpers/projects/alert_management_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/helpers/projects') 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 -- cgit v1.2.3