Add latest changes from gitlab-org/gitlab@master

1 files changed, 9 insertions, 3 deletions

diff --git a/app/controllers/boards/issues_controller.rb b/app/controllers/boards/issues_controller.rb
index ed2c39e3fd3..5e14339bb07 100644
--- a/app/controllers/boards/issues_controller.rb
+++ b/app/controllers/boards/issues_controller.rb
@@ -86,8 +86,12 @@ module Boards
       head(:forbidden) unless can?(current_user, :admin_issue, board)
     end
 
+    def serializer_options(issues)
+      {}
+    end
+
     def render_issues(issues, metadata)
-      data = { issues: serialize_as_json(issues) }
+      data = { issues: serialize_as_json(issues, opts: serializer_options(issues)) }
       data.merge!(metadata)
 
       render json: data
@@ -133,8 +137,10 @@ module Boards
       IssueSerializer.new(current_user: current_user)
     end
 
-    def serialize_as_json(resource)
-      serializer.represent(resource, serializer: 'board', include_full_project_path: board.group_board?)
+    def serialize_as_json(resource, opts: {})
+      opts.merge!(include_full_project_path: board.group_board?, serializer: 'board')
+
+      serializer.represent(resource, opts)
     end
 
     def whitelist_query_limiting