diff options
| author | Eric Eastwood <contact@ericeastwood.com> | 2017-05-18 10:46:44 +0300 |
|---|---|---|
| committer | Eric Eastwood <contact@ericeastwood.com> | 2017-05-18 11:23:16 +0300 |
| commit | f21a31559031c283cbc9cf99a11e98fa519ca0e5 (patch) | |
| tree | d2bec279aad26fbd38ed104b2024c1e09b596c3d /app/views/shared | |
| parent | 319cab4115380d3bff1e6543b759e785aa36a666 (diff) | |
Fix missing .original-note-content and trailing new line edge case
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/32449
Diffstat (limited to 'app/views/shared')
| -rw-r--r-- | app/views/shared/notes/_edit.html.haml | 2 | ||||
| -rw-r--r-- | app/views/shared/notes/_note.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/shared/notes/_edit.html.haml b/app/views/shared/notes/_edit.html.haml index 4a020865828..f4b3aac29b4 100644 --- a/app/views/shared/notes/_edit.html.haml +++ b/app/views/shared/notes/_edit.html.haml @@ -1,3 +1 @@ -.original-note-content.hidden{ data: { post_url: note_url(note), target_id: note.noteable.id, target_type: note.noteable.class.name.underscore } } - #{note.note} %textarea.hidden.js-task-list-field.original-task-list{ data: {update_url: note_url(note) } }= note.note diff --git a/app/views/shared/notes/_note.html.haml b/app/views/shared/notes/_note.html.haml index 87aae793966..53d0e837aa0 100644 --- a/app/views/shared/notes/_note.html.haml +++ b/app/views/shared/notes/_note.html.haml @@ -43,6 +43,8 @@ .note-text.md = note.redacted_note_html = edited_time_ago_with_tooltip(note, placement: 'bottom', html_class: 'note_edited_ago') + .original-note-content.hidden{ data: { post_url: note_url(note), target_id: note.noteable.id, target_type: note.noteable.class.name.underscore } } + #{note.note} - if note_editable = render 'shared/notes/edit', note: note .note-awards |