summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcharlieablett <cablett@gitlab.com>2019-06-10 22:30:00 +1200
committercharlieablett <cablett@gitlab.com>2019-06-13 10:00:30 +1200
commit0c29aa0da38104c4c65cbadcc40abe25e56693aa (patch)
tree7255373495e7015771574e7dc02520e994d7445e
parent714018145cb0ea3265dcfa64c9b4baa33dee588f (diff)
downloadgitlab-ce-ce-3861-use-serializers-for-project-group-boards.tar.gz
Add `to_json` to `represent` method callce-3861-use-serializers-for-project-group-boards
-rw-r--r--app/controllers/concerns/boards_responses.rb2
-rw-r--r--changelogs/unreleased/3861-use-serializers-for-project-group-boards.yml6
-rw-r--r--spec/controllers/concerns/boards_responses_spec.rb2
3 files changed, 2 insertions, 8 deletions
diff --git a/app/controllers/concerns/boards_responses.rb b/app/controllers/concerns/boards_responses.rb
index 128409a2eef..7625600e452 100644
--- a/app/controllers/concerns/boards_responses.rb
+++ b/app/controllers/concerns/boards_responses.rb
@@ -69,7 +69,7 @@ module BoardsResponses
end
def serialize_as_json(resource)
- serializer.represent(resource).to_json
+ serializer.represent(resource).as_json
end
def respond_with(resource)
diff --git a/changelogs/unreleased/3861-use-serializers-for-project-group-boards.yml b/changelogs/unreleased/3861-use-serializers-for-project-group-boards.yml
deleted file mode 100644
index de67944b7b7..00000000000
--- a/changelogs/unreleased/3861-use-serializers-for-project-group-boards.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Refactor Board JSON serialization to use Grape::Entity instead of manual serialization
- (to_json)
-merge_request:
-author:
-type: changed
diff --git a/spec/controllers/concerns/boards_responses_spec.rb b/spec/controllers/concerns/boards_responses_spec.rb
index c080ddf896f..bdebdf94761 100644
--- a/spec/controllers/concerns/boards_responses_spec.rb
+++ b/spec/controllers/concerns/boards_responses_spec.rb
@@ -17,7 +17,7 @@ describe BoardsResponses do
it 'serializes properly' do
expected = { "id" => board.id }
- expect(JSON.parse(subject.serialize_as_json(board))).to include(expected)
+ expect(subject.serialize_as_json(board)).to include(expected)
end
end
end