summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/notes.js
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2016-07-26 13:44:51 +0100
committerPhil Hughes <me@iamphill.com>2016-07-26 13:44:51 +0100
commit6537a4a8feac08031b3be2133f6756afb3310254 (patch)
treedf2996b3371cf34ea7721c7017a2e38e4c05ebd8 /app/assets/javascripts/notes.js
parentc926cdfa4fbe00be7a7a447b3f23059fda7d7f3c (diff)
downloadgitlab-ce-6537a4a8feac08031b3be2133f6756afb3310254.tar.gz
Correctly resolves/unresolves discussions
Diffstat (limited to 'app/assets/javascripts/notes.js')
-rw-r--r--app/assets/javascripts/notes.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/notes.js b/app/assets/javascripts/notes.js
index bb20c143a4d..b5fc21e331b 100644
--- a/app/assets/javascripts/notes.js
+++ b/app/assets/javascripts/notes.js
@@ -300,8 +300,8 @@
discussionContainer.append(note_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))
});
}