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 /app/assets/javascripts/notes.js | |
parent | 5461a5d10ae9179e28b9914e5c567d7eec56c79b (diff) | |
download | gitlab-ce-1f49b99a5cb56317cd7157dfa0f7f9f1ff60a4ab.tar.gz |
Fixed comment & resolve button
Diffstat (limited to 'app/assets/javascripts/notes.js')
-rw-r--r-- | app/assets/javascripts/notes.js | 9 |
1 files changed, 3 insertions, 6 deletions
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')); }; |