diff options
| author | Phil Hughes <me@iamphill.com> | 2017-05-18 09:39:29 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-05-18 09:39:29 +0000 |
| commit | 010e1dacaba3e7626d9066b470402262e7bbb54b (patch) | |
| tree | ba173732bfb2daa5d8809afeb89ed7298390fe8c /app/views | |
| parent | 994532683d4321d920e27b87ef31da61159426ed (diff) | |
| parent | f21a31559031c283cbc9cf99a11e98fa519ca0e5 (diff) | |
| download | gitlab-ce-010e1dacaba3e7626d9066b470402262e7bbb54b.tar.gz | |
Merge branch '32449-fix-note-comparison-trailing-newline-edge-case' into 'master'
Fix note flicker with note you can't edit and trailing new line edge case
Closes #32449
See merge request !11472
Diffstat (limited to 'app/views')
| -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 |