summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home>2016-02-03 15:49:30 -0500
committerJacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home>2016-02-03 15:49:30 -0500
commitbb81eff4bfcdee87095b03df04fd1086924984c0 (patch)
tree94eb2e9bf8436b9bec87eb2be16e3c30bf24dfc7
parentd6d3a132b887c286b5b74e2a14be327f3a302d26 (diff)
downloadgitlab-ce-bb81eff4bfcdee87095b03df04fd1086924984c0.tar.gz
Issue sidebar bug fix.
Thanks @rspeicher.
-rw-r--r--app/controllers/projects/issues_controller.rb4
-rw-r--r--app/views/projects/issues/update.js.haml4
2 files changed, 3 insertions, 5 deletions
diff --git a/app/controllers/projects/issues_controller.rb b/app/controllers/projects/issues_controller.rb
index 1b6ea280ad4..68244883803 100644
--- a/app/controllers/projects/issues_controller.rb
+++ b/app/controllers/projects/issues_controller.rb
@@ -98,9 +98,7 @@ class Projects::IssuesController < Projects::ApplicationController
format.json do
render json: {
saved: @issue.valid?,
- assignee_avatar_url: @issue.assignee.try(:avatar_url),
- milestone: @issue.milestone.title,
- labels: @issue.labels.pluck(:id,:title,:color)
+ assignee_avatar_url: @issue.assignee.try(:avatar_url)
}
end
end
diff --git a/app/views/projects/issues/update.js.haml b/app/views/projects/issues/update.js.haml
index c8e79ade110..a54733883b4 100644
--- a/app/views/projects/issues/update.js.haml
+++ b/app/views/projects/issues/update.js.haml
@@ -1,3 +1,3 @@
-$('aside.right-sidebar')[0].outerHTML = "#{escape_javascript(render 'shared/issuable/sidebar', issuable: @issue)}");
-$('aside.right-sidebar').effect('highlight')
+$('aside.right-sidebar')[0].outerHTML = "#{escape_javascript(render 'shared/issuable/sidebar', issuable: @issue)}";
+$('aside.right-sidebar').effect('highlight');
new Issue(); \ No newline at end of file