Merge branch 'ce-3861-use-serializers-for-project-group-boards' into 'master'

Use serialization for project boards

See merge request gitlab-org/gitlab-ce!29263

2 files changed, 13 insertions, 1 deletions

diff --git a/app/controllers/concerns/boards_actions.rb b/app/controllers/concerns/boards_actions.rb
index ed7ea2f0e04..e4123d87137 100644
--- a/app/controllers/concerns/boards_actions.rb
+++ b/app/controllers/concerns/boards_actions.rb
@@ -35,4 +35,12 @@ module BoardsActions
       boards.find(params[:id])
     end
   end
+
+  def serializer
+    BoardSerializer.new(current_user: current_user)
+  end
+
+  def serialize_as_json(resource)
+    serializer.represent(resource, serializer: 'board', include_full_project_path: board.group_board?)
+  end
 end
diff --git a/app/controllers/concerns/boards_responses.rb b/app/controllers/concerns/boards_responses.rb
index 8b191c86397..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)
-    resource.as_json(only: [:id])
+    serializer.represent(resource).as_json
   end
 
   def respond_with(resource)
@@ -80,4 +80,8 @@ module BoardsResponses
       end
     end
   end
+
+  def serializer
+    BoardSerializer.new
+  end
 end