diff options
| author | Phil Hughes <me@iamphill.com> | 2016-08-31 16:45:41 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-09-21 10:07:24 +0100 |
| commit | 1f49b99a5cb56317cd7157dfa0f7f9f1ff60a4ab (patch) | |
| tree | 1bf0173fd65c9364f04bfb08d9f02e6b321b1a36 | |
| parent | 5461a5d10ae9179e28b9914e5c567d7eec56c79b (diff) | |
| download | gitlab-ce-1f49b99a5cb56317cd7157dfa0f7f9f1ff60a4ab.tar.gz | |
Fixed comment & resolve button
| -rw-r--r-- | CHANGELOG | 5 | ||||
| -rw-r--r-- | app/assets/javascripts/notes.js | 9 | ||||
| -rw-r--r-- | app/views/projects/merge_requests/_discussion.html.haml | 2 |
3 files changed, 9 insertions, 7 deletions
diff --git a/CHANGELOG b/CHANGELOG index 9370bdd17d2..23a5071f5d2 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -189,6 +189,11 @@ v 8.11.6 v 8.11.5 - Optimize branch lookups and force a repository reload for Repository#find_branch. !6087 - Fix member expiration date picker after update. !6184 + +v 8.11.5 (unreleased) + - Optimize branch lookups and force a repository reload for Repository#find_branch + - Fix resolve discussion buttons endpoint path + - Fix member expiration date picker after update - Fix suggested colors options for new labels in the admin area. !6138 - Optimize discussion notes resolving and unresolving - Fix GitLab import button diff --git a/app/assets/javascripts/notes.js b/app/assets/javascripts/notes.js index c6854f703fb..ae2214767a8 100644 --- a/app/assets/javascripts/notes.js +++ b/app/assets/javascripts/notes.js @@ -432,14 +432,12 @@ var $form = $(xhr.target); if ($form.attr('data-resolve-all') != null) { - var namespacePath = $form.attr('data-namespace-path'), - projectPath = $form.attr('data-project-path') + var projectPath = $form.attr('data-project-path') discussionId = $form.attr('data-discussion-id'), - mergeRequestId = $form.attr('data-noteable-iid'), - namespace = namespacePath + '/' + projectPath; + mergeRequestId = $form.attr('data-noteable-iid'); if (ResolveService != null) { - ResolveService.toggleResolveForDiscussion(namespace, mergeRequestId, discussionId); + ResolveService.toggleResolveForDiscussion(projectPath, mergeRequestId, discussionId); } } @@ -854,7 +852,6 @@ .closest('form') .attr('data-discussion-id', discussionId) .attr('data-resolve-all', 'true') - .attr('data-namespace-path', $this.attr('data-namespace-path')) .attr('data-project-path', $this.attr('data-project-path')); }; diff --git a/app/views/projects/merge_requests/_discussion.html.haml b/app/views/projects/merge_requests/_discussion.html.haml index 3900b4f6f17..cfb44bd206c 100644 --- a/app/views/projects/merge_requests/_discussion.html.haml +++ b/app/views/projects/merge_requests/_discussion.html.haml @@ -5,7 +5,7 @@ - if @merge_request.reopenable? = link_to 'Reopen merge request', merge_request_path(@merge_request, merge_request: {state_event: :reopen }), method: :put, class: "btn btn-nr btn-comment btn-reopen reopen-mr-link js-note-target-reopen", title: "Reopen merge request", data: {original_text: "Reopen merge request", alternative_text: "Comment & reopen merge request"} %comment-and-resolve-btn{ "inline-template" => true, ":discussion-id" => "" } - %button.btn.btn-nr.btn-default.append-right-10.js-comment-resolve-button{ "v-if" => "showButton", type: "submit", data: { namespace_path: "#{@merge_request.project.namespace.path}", project_path: "#{@merge_request.project.path}" } } + %button.btn.btn-nr.btn-default.append-right-10.js-comment-resolve-button{ "v-if" => "showButton", type: "submit", data: { project_path: "#{project_path(@merge_request.project)}" } } {{ buttonText }} #notes= render "projects/notes/notes_with_form" |