Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Knox <simon@gitlab.com>2018-03-13 15:01:36 +0300
committerFatih Acet <acetfatih@gmail.com>2018-03-13 15:01:36 +0300
commit8fa001e7604c14a73442e809aa8ec437d39282f1 (patch)
tree2e2c8020eeac066a87c0ccf3540b4a81ee1b1731 /app/controllers/projects/discussions_controller.rb
parent9a1af4a39c79067574c6e96a61d25e5463f10b56 (diff)
Resolve "Projects::MergeRequestsController#show is slow (implement skeleton loading)"
Diffstat (limited to 'app/controllers/projects/discussions_controller.rb')
-rw-r--r--app/controllers/projects/discussions_controller.rb6
1 files changed, 6 insertions, 0 deletions
diff --git a/app/controllers/projects/discussions_controller.rb b/app/controllers/projects/discussions_controller.rb
index ee507009e50..cba9a53dc4b 100644
--- a/app/controllers/projects/discussions_controller.rb
+++ b/app/controllers/projects/discussions_controller.rb
@@ -19,6 +19,12 @@ class Projects::DiscussionsController < Projects::ApplicationController
render_discussion
end
+ def show
+ render json: {
+ discussion_html: view_to_html_string('discussions/_diff_with_notes', discussion: discussion, expanded: true)
+ }
+ end
+
private
def render_discussion