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-07 20:58:01 +0300
committerFelipe Artur <felipefac@gmail.com>2018-02-07 20:58:01 +0300
commit4e19caed10bcae7c6b68c906626f324d673701ad (patch)
tree123f00d3a9e8968f43252b702deb01b7bd719526 /app/controllers/projects
parent007281ca2f7987803c9a2f6e2ecc54ba9cfcafab (diff)
Change 'use_serializer' to 'serializer_notes?'
Diffstat (limited to 'app/controllers/projects')
-rw-r--r--app/controllers/projects/discussions_controller.rb2
-rw-r--r--app/controllers/projects/notes_controller.rb4
2 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/projects/discussions_controller.rb b/app/controllers/projects/discussions_controller.rb
index e7a6f23d5ac..19fa34c2f50 100644
--- a/app/controllers/projects/discussions_controller.rb
+++ b/app/controllers/projects/discussions_controller.rb
@@ -22,7 +22,7 @@ class Projects::DiscussionsController < Projects::ApplicationController
private
def render_discussion
- if use_serializer?
+ if serialize_notes?
# TODO - It is not needed to serialize notes when resolving
# or unresolving discussions. We should remove this behavior
# passing a parameter to DiscussionEntity to return an empty array
diff --git a/app/controllers/projects/notes_controller.rb b/app/controllers/projects/notes_controller.rb
index 5ee876dffd3..dd41b9648e8 100644
--- a/app/controllers/projects/notes_controller.rb
+++ b/app/controllers/projects/notes_controller.rb
@@ -39,7 +39,7 @@ class Projects::NotesController < Projects::ApplicationController
discussion = note.discussion
- if use_serializer?
+ if serialize_notes?
render_json_with_notes_serializer
else
render json: {
@@ -56,7 +56,7 @@ class Projects::NotesController < Projects::ApplicationController
discussion = note.discussion
- if use_serializer?
+ if serialize_notes?
render_json_with_notes_serializer
else
render json: {