summaryrefslogtreecommitdiff
path: root/app/helpers/projects
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-05-08 00:09:56 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-05-08 00:09:56 +0000
commit2824b15286295c161bac449af0d5235d31952eb3 (patch)
treecb1fc8eb52673de66432a208ad93914696d24203 /app/helpers/projects
parent17c8111494f51e79744c782db023804f5e4a7410 (diff)
downloadgitlab-ce-2824b15286295c161bac449af0d5235d31952eb3.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/helpers/projects')
-rw-r--r--app/helpers/projects/alert_management_helper.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/helpers/projects/alert_management_helper.rb b/app/helpers/projects/alert_management_helper.rb
index 07c8168fc24..17f5a400eec 100644
--- a/app/helpers/projects/alert_management_helper.rb
+++ b/app/helpers/projects/alert_management_helper.rb
@@ -4,9 +4,9 @@ module Projects::AlertManagementHelper
def alert_management_data(current_user, project)
{
'project-path' => project.full_path,
- 'enable-alert-management-path' => project_settings_operations_path(project),
+ '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' => 'false',
+ 'user-can-enable-alert-management' => can?(current_user, :admin_project, project).to_s,
'alert-management-enabled' => Feature.enabled?(:alert_management_minimal, project).to_s
}
end