summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Greiling <mike@pixelcog.com>2016-12-12 13:03:22 -0600
committerMike Greiling <mike@pixelcog.com>2016-12-12 13:03:22 -0600
commite8d1c7a5b6b942f591539531bfe48dc72b3cd16b (patch)
tree9c60b91293961fbbf84619b7fb3aeaaef7df5fea
parentd6fb30eb4f0fb42f1f1c23ce63e33e4d7422ef2e (diff)
downloadgitlab-ce-25155-fix-edited-text-in-comments.tar.gz
break comment "edited at" block out of the note-text element to prevent issues with inline text nodes25155-fix-edited-text-in-comments
-rw-r--r--app/views/projects/notes/_note.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/notes/_note.html.haml b/app/views/projects/notes/_note.html.haml
index ba8895438c5..778a32e6345 100644
--- a/app/views/projects/notes/_note.html.haml
+++ b/app/views/projects/notes/_note.html.haml
@@ -65,7 +65,7 @@
.note-text.md
= preserve do
= note.redacted_note_html
- = edited_time_ago_with_tooltip(note, placement: 'bottom', html_class: 'note_edited_ago', include_author: true)
+ = edited_time_ago_with_tooltip(note, placement: 'bottom', html_class: 'note_edited_ago', include_author: true)
- if note_editable
= render 'projects/notes/edit_form', note: note
.note-awards