summaryrefslogtreecommitdiff
path: root/app/controllers/projects/discussions_controller.rb
diff options
context:
space:
mode:
authorDouwe Maan <douwe@selenight.nl>2016-07-28 20:09:36 -0600
committerDouwe Maan <douwe@selenight.nl>2016-07-28 20:09:36 -0600
commit1c2eefef3f67d9d221b6465ec77907940732e789 (patch)
tree36c66b062f5d328ea3cd41aea5d8ea483f08efe8 /app/controllers/projects/discussions_controller.rb
parent6d9715d8777265737c076abe06362d2a8e9e498d (diff)
downloadgitlab-ce-1c2eefef3f67d9d221b6465ec77907940732e789.tar.gz
Backend tweaks
Diffstat (limited to 'app/controllers/projects/discussions_controller.rb')
-rw-r--r--app/controllers/projects/discussions_controller.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/projects/discussions_controller.rb b/app/controllers/projects/discussions_controller.rb
index 47f301a08d9..11c8f714a95 100644
--- a/app/controllers/projects/discussions_controller.rb
+++ b/app/controllers/projects/discussions_controller.rb
@@ -11,7 +11,7 @@ class Projects::DiscussionsController < Projects::ApplicationController
render json: {
resolved_by: discussion.resolved_by.try(:name),
- updated_html: view_to_html_string('discussions/_headline', discussion: discussion)
+ discussion_headline_html: view_to_html_string('discussions/_headline', discussion: discussion)
}
end
@@ -21,7 +21,7 @@ class Projects::DiscussionsController < Projects::ApplicationController
discussion.unresolve!
render json: {
- updated_html: view_to_html_string('discussions/_headline', discussion: discussion)
+ discussion_headline_html: view_to_html_string('discussions/_headline', discussion: discussion)
}
end