diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-07 00:10:15 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-07 00:10:15 +0300 |
commit | 0790cf032c70b3df250e1953a3a11b71d835c5a1 (patch) | |
tree | ca31b07a5623da26df1fa0323832c7896b5e3386 /app/policies | |
parent | 37419c44f04cd802ac89fe2d54b8501a0718a5e3 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/policies')
-rw-r--r-- | app/policies/group_policy.rb | 1 | ||||
-rw-r--r-- | app/policies/user_policy.rb | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/app/policies/group_policy.rb b/app/policies/group_policy.rb index 62f66093875..42545cffc61 100644 --- a/app/policies/group_policy.rb +++ b/app/policies/group_policy.rb @@ -138,6 +138,7 @@ class GroupPolicy < BasePolicy enable :read_group_labels enable :read_group_milestones enable :read_group_merge_requests + enable :read_group_build_report_results end rule { can?(:read_cross_project) & can?(:read_group) }.policy do diff --git a/app/policies/user_policy.rb b/app/policies/user_policy.rb index 43f472b4c1d..6ebafca9885 100644 --- a/app/policies/user_policy.rb +++ b/app/policies/user_policy.rb @@ -20,6 +20,7 @@ class UserPolicy < BasePolicy enable :destroy_user enable :update_user enable :update_user_status + enable :read_user_personal_access_tokens end rule { default }.enable :read_user_profile |