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:
Diffstat (limited to 'app/controllers/projects/discussions_controller.rb')
-rw-r--r--app/controllers/projects/discussions_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/projects/discussions_controller.rb b/app/controllers/projects/discussions_controller.rb
index a61930d4b99..59de4fbb698 100644
--- a/app/controllers/projects/discussions_controller.rb
+++ b/app/controllers/projects/discussions_controller.rb
@@ -34,7 +34,7 @@ class Projects::DiscussionsController < Projects::ApplicationController
def render_discussion
if serialize_notes?
- prepare_notes_for_rendering(discussion.notes, merge_request)
+ prepare_notes_for_rendering(discussion.notes)
render_json_with_discussions_serializer
else
render_json_with_html