diff options
| author | André Luís <me@andr3.net> | 2018-10-06 17:16:40 +0000 |
|---|---|---|
| committer | Tim Zallmann <tzallmann@gitlab.com> | 2018-10-06 17:16:40 +0000 |
| commit | 8e5c0e68ec837fe247df271a58a819238b8c20b1 (patch) | |
| tree | cce05bb0548404b2bbeb0ecd7ad27c6659f45040 /app/views | |
| parent | 54c442af23169cc146bb6bb2484ca2d3d98ef870 (diff) | |
| download | gitlab-ce-8e5c0e68ec837fe247df271a58a819238b8c20b1.tar.gz | |
Backport CE changes for: [Frontend only] Batch comments on merge requests
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/projects/issues/_discussion.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/merge_requests/show.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/issues/_discussion.html.haml b/app/views/projects/issues/_discussion.html.haml index 665968a64e1..28998acdc13 100644 --- a/app/views/projects/issues/_discussion.html.haml +++ b/app/views/projects/issues/_discussion.html.haml @@ -6,7 +6,7 @@ = link_to 'Close issue', issue_path(@issue, issue: {state_event: :close}, format: 'json'), data: {original_text: "Close issue", alternative_text: "Comment & close issue"}, class: "btn btn-nr btn-close btn-comment js-note-target-close #{issue_button_visibility(@issue, true)}", title: 'Close issue' %section.js-vue-notes-event - #js-vue-notes{ data: { notes_data: notes_data(@issue), + #js-vue-notes{ data: { notes_data: notes_data(@issue).to_json, noteable_data: serialize_issuable(@issue), noteable_type: 'Issue', target_type: 'issue', diff --git a/app/views/projects/merge_requests/show.html.haml b/app/views/projects/merge_requests/show.html.haml index b23baa22d8b..ef2fa8668c0 100644 --- a/app/views/projects/merge_requests/show.html.haml +++ b/app/views/projects/merge_requests/show.html.haml @@ -60,7 +60,7 @@ %section.col-md-12 %script.js-notes-data{ type: "application/json" }= initial_notes_data(true).to_json.html_safe .issuable-discussion.js-vue-notes-event - #js-vue-mr-discussions{ data: { notes_data: notes_data(@merge_request), + #js-vue-mr-discussions{ data: { notes_data: notes_data(@merge_request).to_json, noteable_data: serialize_issuable(@merge_request), noteable_type: 'MergeRequest', target_type: 'merge_request', |