diff options
| author | Simon Knox <psimyn@gmail.com> | 2018-02-22 21:30:34 +1100 |
|---|---|---|
| committer | Simon Knox <psimyn@gmail.com> | 2018-02-22 21:30:34 +1100 |
| commit | 7fedea1abe079dd06a41a14794cf143b79cf26a5 (patch) | |
| tree | 748a1cf1ede813c5a339dc3a8c1b4538e141e32e | |
| parent | 5e7b057995d5ac16f25ebb2296847a58fd958e2e (diff) | |
| download | gitlab-ce-mr-notes-no-cookie.tar.gz | |
fix editing notes on MR diffs tabmr-notes-no-cookie
removed duplicate form stuff
| -rw-r--r-- | app/assets/javascripts/notes.js | 14 | ||||
| -rw-r--r-- | app/views/projects/merge_requests/show.html.haml | 1 |
2 files changed, 2 insertions, 13 deletions
diff --git a/app/assets/javascripts/notes.js b/app/assets/javascripts/notes.js index c059df2787c..319ca323e77 100644 --- a/app/assets/javascripts/notes.js +++ b/app/assets/javascripts/notes.js @@ -93,12 +93,6 @@ export default class Notes { }); this.collapseLongCommitList(); this.setViewType(view); - - // We are in the Merge Requests page so we need another edit form for Changes tab - if (getPagePath(1) === 'merge_requests') { - $('.note-edit-form').clone() - .addClass('mr-note-edit-form').insertAfter('.note-edit-form'); - } } setViewType(view) { @@ -740,13 +734,7 @@ export default class Notes { } getEditFormSelector($el) { - var selector = '.note-edit-form:not(.mr-note-edit-form)'; - - if ($el.parents('#diffs').length) { - selector = '.note-edit-form.mr-note-edit-form'; - } - - return selector; + return '.note-edit-form'; } removeNoteEditForm($note) { diff --git a/app/views/projects/merge_requests/show.html.haml b/app/views/projects/merge_requests/show.html.haml index 83c5b03a15a..acf4a7ef5a5 100644 --- a/app/views/projects/merge_requests/show.html.haml +++ b/app/views/projects/merge_requests/show.html.haml @@ -67,6 +67,7 @@ .issuable-discussion.js-vue-notes-event .hidden = render "shared/notes/form", view: diff_view, supports_autocomplete: true + = render 'shared/notes/edit_form', project: @project #js-vue-mr-discussions{ data: { notes_data: notes_data(@merge_request), noteable_data: serialize_issuable(@merge_request), current_user_data: UserSerializer.new.represent(current_user).to_json} } |