summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2015-09-25 16:27:41 -0400
committerRobert Speicher <rspeicher@gmail.com>2015-09-30 16:58:34 -0400
commit9ade9a64519395d77b6ef143ad063103d6ff3d10 (patch)
treef0bdf43ef20ff7f77c42558f9151d6d0060985bd
parent2714d5b8147cef39343a1c35ba099ebe6445f5e4 (diff)
downloadgitlab-ce-9ade9a64519395d77b6ef143ad063103d6ff3d10.tar.gz
Don't render the edit_form view for system notes
-rw-r--r--app/views/projects/notes/_note.html.haml4
1 files changed, 3 insertions, 1 deletions
diff --git a/app/views/projects/notes/_note.html.haml b/app/views/projects/notes/_note.html.haml
index 9bfbde02ca2..cf5d5d6d8ba 100644
--- a/app/views/projects/notes/_note.html.haml
+++ b/app/views/projects/notes/_note.html.haml
@@ -59,7 +59,9 @@
.note-text
= preserve do
= markdown(note.note, {no_header_anchors: true})
- = render 'projects/notes/edit_form', note: note
+ - unless note.system?
+ -# System notes can't be edited
+ = render 'projects/notes/edit_form', note: note
- if note.attachment.url
.note-attachment