diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-10-03 12:09:43 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-10-03 12:09:43 +0300 |
commit | 10d4625ed3b73f73bc67bf7d35347dcd1912cf7b (patch) | |
tree | ee42f413ec64e2a60550d741e8428615ecafb393 /app/policies/note_policy.rb | |
parent | f743b4205666c85465eb6c6b0487414e6ec331da (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/policies/note_policy.rb')
-rw-r--r-- | app/policies/note_policy.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/policies/note_policy.rb b/app/policies/note_policy.rb index 1bffcc5aea2..dbfc63a0069 100644 --- a/app/policies/note_policy.rb +++ b/app/policies/note_policy.rb @@ -20,7 +20,8 @@ class NotePolicy < BasePolicy condition(:confidential, scope: :subject) { @subject.confidential? } - # If this condition changes IssuablePolicy#read_confidential_notes should be updated too + # Should be matched with IssuablePolicy#read_internal_note + # and EpicPolicy#read_internal_note condition(:can_read_confidential) do access_level >= Gitlab::Access::REPORTER || @subject.noteable_assignee_or_author?(@user) || admin? end |