diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-24 03:09:05 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-24 03:09:05 +0000 |
commit | 07d0374b204881f2bd64ed897e4bbab19f180cc9 (patch) | |
tree | ed7837a31c0edae5e8ec876626b0bf3ecb3db68c /app/views | |
parent | 2ed3b0abccc8de391f1a9de2bc5785d3e0f5b018 (diff) | |
download | gitlab-ce-07d0374b204881f2bd64ed897e4bbab19f180cc9.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views')
-rw-r--r-- | app/views/shared/notes/_note.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/shared/notes/_note.html.haml b/app/views/shared/notes/_note.html.haml index 5c9dd72418e..50bc4fb35df 100644 --- a/app/views/shared/notes/_note.html.haml +++ b/app/views/shared/notes/_note.html.haml @@ -1,5 +1,5 @@ - return unless note.author -- return if note.cross_reference_not_visible_for?(current_user) +- return unless note.readable_by?(current_user) - show_image_comment_badge = local_assigns.fetch(:show_image_comment_badge, false) - note_editable = can?(current_user, :admin_note, note) |