diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2017-01-19 23:31:05 +0100 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2017-01-19 23:31:05 +0100 |
| commit | e6875cb0f3513fbc8609629d4a1a033b38e82716 (patch) | |
| tree | d92d20081b7695f4989fbb0aeceb4cd618823648 /app/assets/javascripts/diff_notes/services/resolve.js.es6 | |
| parent | 31af6be076635e6c6936564558bb977740d39eb0 (diff) | |
| parent | 1c81452a9955bb06515faf26cedbe8e2b28791d5 (diff) | |
| download | gitlab-ce-e6875cb0f3513fbc8609629d4a1a033b38e82716.tar.gz | |
Merge remote-tracking branch 'origin/master' into 21698-redis-runner-last-build
Diffstat (limited to 'app/assets/javascripts/diff_notes/services/resolve.js.es6')
| -rw-r--r-- | app/assets/javascripts/diff_notes/services/resolve.js.es6 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/assets/javascripts/diff_notes/services/resolve.js.es6 b/app/assets/javascripts/diff_notes/services/resolve.js.es6 index 78c74985f78..a52c476352d 100644 --- a/app/assets/javascripts/diff_notes/services/resolve.js.es6 +++ b/app/assets/javascripts/diff_notes/services/resolve.js.es6 @@ -1,4 +1,4 @@ -/* eslint-disable class-methods-use-this, one-var, indent, camelcase, no-new, comma-dangle, semi, no-param-reassign, max-len */ +/* eslint-disable class-methods-use-this, one-var, camelcase, no-new, comma-dangle, no-param-reassign, max-len */ /* global Vue */ /* global Flash */ /* global CommentsStore */ @@ -32,8 +32,8 @@ } toggleResolveForDiscussion(projectPath, mergeRequestId, discussionId) { - const discussion = CommentsStore.state[discussionId], - isResolved = discussion.isResolved(); + const discussion = CommentsStore.state[discussionId]; + const isResolved = discussion.isResolved(); let promise; if (isResolved) { @@ -59,7 +59,7 @@ } else { new Flash('An error occurred when trying to resolve a discussion. Please try again.', 'alert'); } - }) + }); } resolveAll(projectPath, mergeRequestId, discussionId) { |