diff options
| author | Phil Hughes <me@iamphill.com> | 2016-07-26 14:30:57 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-07-26 14:30:57 +0100 |
| commit | 5e8606562df861e22d80e888457300f862aeb89b (patch) | |
| tree | aa7789b6464ea876717f16846070869d1caa5d59 /app/assets/javascripts/diff_notes/components | |
| parent | 6537a4a8feac08031b3be2133f6756afb3310254 (diff) | |
| download | gitlab-ce-5e8606562df861e22d80e888457300f862aeb89b.tar.gz | |
Added ability to toggle resolving by commenting
Diffstat (limited to 'app/assets/javascripts/diff_notes/components')
| -rw-r--r-- | app/assets/javascripts/diff_notes/components/resolve_all_btn.js.es6 | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/app/assets/javascripts/diff_notes/components/resolve_all_btn.js.es6 b/app/assets/javascripts/diff_notes/components/resolve_all_btn.js.es6 index 4c56386ad66..102f213cae5 100644 --- a/app/assets/javascripts/diff_notes/components/resolve_all_btn.js.es6 +++ b/app/assets/javascripts/diff_notes/components/resolve_all_btn.js.es6 @@ -40,15 +40,7 @@ }, methods: { resolve: function () { - let promise; - - if (this.allResolved) { - promise = ResolveService - .unResolveAll(this.namespace, this.mergeRequestId, this.discussionId); - } else { - promise = ResolveService - .resolveAll(this.namespace, this.mergeRequestId, this.discussionId); - } + ResolveService.toggleResolveForDiscussion(this.namespace, this.mergeRequestId, this.discussionId); } } }); |