diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2024-01-23 06:10:35 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2024-01-23 06:10:35 +0300 |
commit | 89ff92639b7ad6499fb1e9470e4151fb112a904e (patch) | |
tree | c03a3e8d5f5b905cd07932e7780e8f0d533e5ec6 /app/policies | |
parent | 422294262e50d47bee73c2e85bfbc21473c2508a (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/policies')
-rw-r--r-- | app/policies/merge_request_policy.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/app/policies/merge_request_policy.rb b/app/policies/merge_request_policy.rb index 49f9225a1d3..27bcd816a08 100644 --- a/app/policies/merge_request_policy.rb +++ b/app/policies/merge_request_policy.rb @@ -14,6 +14,7 @@ class MergeRequestPolicy < IssuablePolicy rule { ~can?(:read_merge_request) }.policy do prevent :create_note prevent :accept_merge_request + prevent :mark_note_as_internal end rule { can_approve }.policy do @@ -43,6 +44,10 @@ class MergeRequestPolicy < IssuablePolicy enable :set_merge_request_metadata end + rule { can?(:reporter_access) }.policy do + enable :mark_note_as_internal + end + private def can_approve? |