summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/merge_request_tabs.js
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2016-07-27 16:57:48 +0100
committerPhil Hughes <me@iamphill.com>2016-07-27 16:57:48 +0100
commit86446846e963ea1304b56fa74b4ca795a491bbb5 (patch)
tree5020febc504570b27d7692afa6834b1cc0e1ef04 /app/assets/javascripts/merge_request_tabs.js
parentb53ccd112d10416f3dd4a1a661cdd4345ee89d9b (diff)
downloadgitlab-ce-86446846e963ea1304b56fa74b4ca795a491bbb5.tar.gz
Added tests for resolving comments feature
Diffstat (limited to 'app/assets/javascripts/merge_request_tabs.js')
-rw-r--r--app/assets/javascripts/merge_request_tabs.js4
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 332288dcf8e..2343ace3b68 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-btn').length && (typeof DiffNotesApp !== "undefined" && DiffNotesApp !== null)) {
- $('resolve-btn, resolve-all-btn').each(function () {
+ if ($('resolve-btn, resolve-all-btn, jump-to-discussion').length && (typeof DiffNotesApp !== "undefined" && DiffNotesApp !== null)) {
+ $('resolve-btn, resolve-all-btn, jump-to-discussion').each(function () {
DiffNotesApp.$compile($(this).get(0))
});
}