diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2017-06-20 19:31:02 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2017-06-20 19:31:02 +0000 |
| commit | b2e1d32e7a74b22b23e8ab052bd29e15bb8a4f1e (patch) | |
| tree | 79b712d3b8e8cefe4b758348209b4270e5886e86 /app | |
| parent | 780adff549a48b6c4d0ba77725b4027b0616178f (diff) | |
| parent | f7ad9e5abbfd0916a4f93e22d97cbdac17c46986 (diff) | |
| download | gitlab-ce-b2e1d32e7a74b22b23e8ab052bd29e15bb8a4f1e.tar.gz | |
Merge branch '33868-fix-mr-changes-diff-note-up-arrow-editing' into 'master'34013-names-with-spaces-break-issue-filter-bar
Fix pressing up-arrow on a MR "Changes" diff discussion edits your last note
Closes #33868
See merge request !12297
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/notes.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/notes.js b/app/assets/javascripts/notes.js index 6a6dabfd00c..624dd336786 100644 --- a/app/assets/javascripts/notes.js +++ b/app/assets/javascripts/notes.js @@ -187,7 +187,7 @@ const normalizeNewlines = function(str) { if ($textarea.val() !== '') { return; } - myLastNote = $(`li.note[data-author-id='${gon.current_user_id}'][data-editable]:last`, $textarea.closest('.note, #notes')); + myLastNote = $(`li.note[data-author-id='${gon.current_user_id}'][data-editable]:last`, $textarea.closest('.note, .notes_holder, #notes')); if (myLastNote.length) { myLastNoteEditBtn = myLastNote.find('.js-note-edit'); return myLastNoteEditBtn.trigger('click', [true, myLastNote]); |