diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2017-11-06 12:55:02 +0300 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2017-11-06 12:55:02 +0300 |
commit | 46dc343f605f0c98d2b9ec44617d313a1548b4e2 (patch) | |
tree | ddc72be3af3001ee1c452f41298955e6393df316 /app | |
parent | 823a9d351b49a6be8c12cfe06edb4aa6ec08fe95 (diff) | |
parent | 727561f4cac6d39f285519c3e5eca4559d51b131 (diff) |
Merge branch '38677-render-new-discussions-on-diff-tab' into 'master'
Added discussion_line_code value to note response and use it to query the right…
Closes #38677
See merge request gitlab-org/gitlab-ce!14981
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/javascripts/notes.js | 3 | ||||
-rw-r--r-- | app/controllers/concerns/notes_actions.rb | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/app/assets/javascripts/notes.js b/app/assets/javascripts/notes.js index 705bec23b53..e1ab28978e8 100644 --- a/app/assets/javascripts/notes.js +++ b/app/assets/javascripts/notes.js @@ -413,8 +413,9 @@ export default class Notes { return; } this.note_ids.push(noteEntity.id); + form = $form || $(`.js-discussion-note-form[data-discussion-id="${noteEntity.discussion_id}"]`); - row = form.closest('tr'); + row = (form.length || !noteEntity.discussion_line_code) ? form.closest('tr') : $(`#${noteEntity.discussion_line_code}`); if (noteEntity.on_image) { row = form; diff --git a/app/controllers/concerns/notes_actions.rb b/app/controllers/concerns/notes_actions.rb index fb9c942d302..57b45f335fa 100644 --- a/app/controllers/concerns/notes_actions.rb +++ b/app/controllers/concerns/notes_actions.rb @@ -109,6 +109,8 @@ module NotesActions diff_discussion_html: diff_discussion_html(discussion), discussion_html: discussion_html(discussion) ) + + attrs[:discussion_line_code] = discussion.line_code if discussion.diff_discussion? end end else |