diff options
| author | Douwe Maan <douwe@selenight.nl> | 2017-04-28 09:57:17 -0500 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2017-04-28 11:37:19 -0500 |
| commit | 0be3187a56603e26b677d31880be0dc21072f687 (patch) | |
| tree | 3f2763bfed60f9fe09468303d6a23468f578c7a9 /app/views/projects/notes | |
| parent | 31b87b8cab2c2daebb99657046e5d121b48499ad (diff) | |
| download | gitlab-ce-0be3187a56603e26b677d31880be0dc21072f687.tar.gz | |
Pull preserve into render helpers
Diffstat (limited to 'app/views/projects/notes')
| -rw-r--r-- | app/views/projects/notes/_note.html.haml | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/views/projects/notes/_note.html.haml b/app/views/projects/notes/_note.html.haml index 7cf604bb772..7afccb3900a 100644 --- a/app/views/projects/notes/_note.html.haml +++ b/app/views/projects/notes/_note.html.haml @@ -75,8 +75,7 @@ = icon('trash-o', class: 'danger-highlight') .note-body{ class: note_editable ? 'js-task-list-container' : '' } .note-text.md - = preserve do - = note.redacted_note_html + = note.redacted_note_html = edited_time_ago_with_tooltip(note, placement: 'bottom', html_class: 'note_edited_ago', include_author: true) - if note_editable .original-note-content.hidden{ data: { post_url: namespace_project_note_path(@project.namespace, @project, note), target_id: note.noteable.id, target_type: note.noteable.class.name.underscore } } |