diff options
| author | Phil Hughes <me@iamphill.com> | 2016-07-26 15:44:51 +0300 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-07-26 15:44:51 +0300 |
| commit | 6537a4a8feac08031b3be2133f6756afb3310254 (patch) | |
| tree | df2996b3371cf34ea7721c7017a2e38e4c05ebd8 /app/assets/javascripts/merge_request_tabs.js | |
| parent | c926cdfa4fbe00be7a7a447b3f23059fda7d7f3c (diff) | |
Correctly resolves/unresolves discussions
Diffstat (limited to 'app/assets/javascripts/merge_request_tabs.js')
| -rw-r--r-- | app/assets/javascripts/merge_request_tabs.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/merge_request_tabs.js b/app/assets/javascripts/merge_request_tabs.js index 61d05932b57..332288dcf8e 100644 --- a/app/assets/javascripts/merge_request_tabs.js +++ b/app/assets/javascripts/merge_request_tabs.js @@ -120,8 +120,8 @@ return function(data) { $('#diffs').html(data.html); - if ($('resolve-btn, resolve-all').length && (typeof DiffNotesApp !== "undefined" && DiffNotesApp !== null)) { - $('resolve-btn, resolve-all').each(function () { + if ($('resolve-btn, resolve-all-btn').length && (typeof DiffNotesApp !== "undefined" && DiffNotesApp !== null)) { + $('resolve-btn, resolve-all-btn').each(function () { DiffNotesApp.$compile($(this).get(0)) }); } |