summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Schatz <jschatz@gitlab.com>2016-04-18 13:37:27 +0000
committerJacob Schatz <jschatz@gitlab.com>2016-04-18 13:37:27 +0000
commit5ae4fd2181e81f6e75a9d4021fc7d0c4749139ef (patch)
tree67352afbf54a70645c6cf84cee01118983030077
parent2c8c898318d33155e3df80876d4be1d0f10db5a6 (diff)
parentc24640c721aed987a22c2e097cada73145cfb12b (diff)
downloadgitlab-ce-5ae4fd2181e81f6e75a9d4021fc7d0c4749139ef.tar.gz
Merge branch 'tasklist-fix' into 'master'
Fixed issue with tasklist toggling sidebar refresh Closes #15270 See merge request !3782
-rw-r--r--app/views/projects/issues/update.js.haml3
-rw-r--r--app/views/projects/merge_requests/update.js.haml3
2 files changed, 0 insertions, 6 deletions
diff --git a/app/views/projects/issues/update.js.haml b/app/views/projects/issues/update.js.haml
index 986d8c220db..e69de29bb2d 100644
--- a/app/views/projects/issues/update.js.haml
+++ b/app/views/projects/issues/update.js.haml
@@ -1,3 +0,0 @@
-$('aside.right-sidebar')[0].outerHTML = "#{escape_javascript(render 'shared/issuable/sidebar', issuable: @issue)}";
-$('aside.right-sidebar').effect('highlight');
-new IssuableContext();
diff --git a/app/views/projects/merge_requests/update.js.haml b/app/views/projects/merge_requests/update.js.haml
index 9cce5660e1c..e69de29bb2d 100644
--- a/app/views/projects/merge_requests/update.js.haml
+++ b/app/views/projects/merge_requests/update.js.haml
@@ -1,3 +0,0 @@
-$('aside.right-sidebar')[0].outerHTML = "#{escape_javascript(render 'shared/issuable/sidebar', issuable: @merge_request)}";
-$('aside.right-sidebar').effect('highlight');
-new IssuableContext();