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:
authorFelipe Artur <felipefac@gmail.com>2018-02-06 22:16:23 +0300
committerFelipe Artur <felipefac@gmail.com>2018-02-06 22:16:23 +0300
commit61855d64ec5e23bd5a04d9d6924b97c742cf9d39 (patch)
treea5a0be5fa9928f6f9eb06ec6d242dbde97b62aa6 /app/controllers/projects
parent5035ab7bc5c85ac09a629b2d14dbc7e52e353748 (diff)
add more specs
Diffstat (limited to 'app/controllers/projects')
-rw-r--r--app/controllers/projects/discussions_controller.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/app/controllers/projects/discussions_controller.rb b/app/controllers/projects/discussions_controller.rb
index 6efe7657ad4..e7a6f23d5ac 100644
--- a/app/controllers/projects/discussions_controller.rb
+++ b/app/controllers/projects/discussions_controller.rb
@@ -24,7 +24,9 @@ class Projects::DiscussionsController < Projects::ApplicationController
def render_discussion
if use_serializer?
# TODO - It is not needed to serialize notes when resolving
- # or unresolving discussions. We should remove this behavior.
+ # or unresolving discussions. We should remove this behavior
+ # passing a parameter to DiscussionEntity to return an empty array
+ # for notes.
prepare_notes_for_rendering(discussion.notes, merge_request)
render_json_with_discussions_serializer
else