Merge branch '34510-board-issues-sql-speedup' into 'master'

fix #34510 add association preloading for issue boards

Closes #34510

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

1 files changed, 9 insertions, 4 deletions

diff --git a/app/controllers/boards/issues_controller.rb b/app/controllers/boards/issues_controller.rb
index 8d4ec2d6d9d..0d74078645a 100644
--- a/app/controllers/boards/issues_controller.rb
+++ b/app/controllers/boards/issues_controller.rb
@@ -11,9 +11,15 @@ module Boards
       issues = Boards::Issues::ListService.new(board_parent, current_user, filter_params).execute
       issues = issues.page(params[:page]).per(params[:per] || 20)
       make_sure_position_is_set(issues)
+      issues = issues.preload(:project,
+                              :milestone,
+                              :assignees,
+                              labels: [:priorities],
+                              notes: [:award_emoji, :author]
+                             )
 
       render json: {
-        issues: serialize_as_json(issues.preload(:project)),
+        issues: serialize_as_json(issues),
         size: issues.total_count
       }
     end
@@ -76,14 +82,13 @@ module Boards
 
     def serialize_as_json(resource)
       resource.as_json(
-        labels: true,
         only: [:id, :iid, :project_id, :title, :confidential, :due_date, :relative_position],
+        labels: true,
         include: {
           project: { only: [:id, :path] },
           assignees: { only: [:id, :name, :username], methods: [:avatar_url] },
           milestone: { only: [:id, :title] }
-        },
-        user: current_user
+        }
       )
     end
   end