diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-01 00:10:09 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-01 00:10:09 +0300 |
| commit | 15229b03e058208b2feac568832eb43f109ac3cd (patch) | |
| tree | 2bb2063ae02a72849091c9588945d03df7710ad5 /app/helpers/projects_helper.rb | |
| parent | 6010cf135a52a37b200112fa353900a690f958a7 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/helpers/projects_helper.rb')
| -rw-r--r-- | app/helpers/projects_helper.rb | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index 0299cc7e142..6e317a63e47 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -468,7 +468,7 @@ module ProjectsHelper serverless: :read_cluster, error_tracking: :read_sentry_issue, alert_management: :read_alert_management_alert, - incidents: :read_incidents, + incidents: :read_issue, labels: :read_label, issues: :read_issue, project_members: :read_project_member, @@ -477,7 +477,14 @@ module ProjectsHelper end def can_view_operations_tab?(current_user, project) - [:read_environment, :read_cluster, :metrics_dashboard].any? do |ability| + [ + :metrics_dashboard, + :read_alert_management_alert, + :read_environment, + :read_issue, + :read_sentry_issue, + :read_cluster + ].any? do |ability| can?(current_user, ability, project) end end |