summaryrefslogtreecommitdiff
path: root/app/views/shared/notes
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2018-04-12 17:04:08 +0000
committerRobert Speicher <robert@gitlab.com>2018-04-12 17:04:08 +0000
commitf5a3d8f75de50f0ac6a14e77c672da79df85866e (patch)
treeb0d3655e4a738867696e82cee07309b17e175531 /app/views/shared/notes
parent64f91be000bc2963a48851db4dcb0a6bbd2b57bc (diff)
parenteae2ed3366ac13832c56aefe965513b986d7e8b1 (diff)
downloadgitlab-ce-f5a3d8f75de50f0ac6a14e77c672da79df85866e.tar.gz
Merge branch 'dm-archived-read-only' into 'master'
Make archived projects completely read-only Closes #44788 See merge request gitlab-org/gitlab-ce!18136
Diffstat (limited to 'app/views/shared/notes')
-rw-r--r--app/views/shared/notes/_note.html.haml2
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 bf359774ead..893a7f26ebd 100644
--- a/app/views/shared/notes/_note.html.haml
+++ b/app/views/shared/notes/_note.html.haml
@@ -2,7 +2,7 @@
- return if note.cross_reference_not_visible_for?(current_user)
- show_image_comment_badge = local_assigns.fetch(:show_image_comment_badge, false)
-- note_editable = note_editable?(note)
+- note_editable = can?(current_user, :admin_note, note)
- note_counter = local_assigns.fetch(:note_counter, 0)
%li.timeline-entry{ id: dom_id(note),