diff options
author | Felipe Artur <felipefac@gmail.com> | 2016-06-29 11:31:50 -0300 |
---|---|---|
committer | Felipe Artur <felipefac@gmail.com> | 2016-06-29 11:32:38 -0300 |
commit | d2971315abd0e6e94860505e50ec71082c3679da (patch) | |
tree | 0f3dcf23406ec9fb3d6362b7f746e978ace692b3 /app/views/projects/notes/_note.html.haml | |
parent | 36d48120f66d52dcc8697893ca1ab85322ba7c8b (diff) | |
parent | bef4294c58e0bbadc01f633fc8bea514801de7ae (diff) | |
download | gitlab-ce-d2971315abd0e6e94860505e50ec71082c3679da.tar.gz |
Merge branch 'master' into issue_3359_3issue_3359_3
Diffstat (limited to 'app/views/projects/notes/_note.html.haml')
-rw-r--r-- | app/views/projects/notes/_note.html.haml | 2 |
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 c04d291412c..a5e163b91e9 100644 --- a/app/views/projects/notes/_note.html.haml +++ b/app/views/projects/notes/_note.html.haml @@ -32,7 +32,7 @@ .note-body{class: note_editable ? 'js-task-list-container' : ''} .note-text = preserve do - = markdown(note.note, pipeline: :note, cache_key: [note, "note"], author: note.author) + = note.note_html = 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 |