diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-27 12:08:28 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-27 12:08:28 +0300 |
| commit | 6ac4a6713ed3196af899011f7e18658e16ebaac0 (patch) | |
| tree | c60237cb5203d171481b765d31bfead080d063cf /app/policies | |
| parent | d2b64c37bdef067656fdc8deb4728a2fbc6c2729 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/policies')
| -rw-r--r-- | app/policies/note_policy.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/policies/note_policy.rb b/app/policies/note_policy.rb index 82ebf6ba6a5..2217aa1326c 100644 --- a/app/policies/note_policy.rb +++ b/app/policies/note_policy.rb @@ -19,7 +19,7 @@ class NotePolicy < BasePolicy condition(:confidential, scope: :subject) { @subject.confidential? } condition(:can_read_confidential) do - access_level >= Gitlab::Access::REPORTER || @subject.noteable_assignee_or_author?(@user) + access_level >= Gitlab::Access::REPORTER || @subject.noteable_assignee_or_author?(@user) || admin? end rule { ~editable }.prevent :admin_note |