diff options
author | Douwe Maan <douwe@gitlab.com> | 2017-09-14 08:30:11 +0000 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2017-09-14 08:30:11 +0000 |
commit | 3238dc8654949de6ad073ccab2cc61e4da249cd3 (patch) | |
tree | 4fdac5c2bbdb5a4b6f77f055b6498879fb3089a1 /app | |
parent | d3b89a407c1fbfc0011acb8724cef08fd755580b (diff) | |
parent | b376e5c80e3dc6f30dfcc06f6a63209381414f89 (diff) | |
download | gitlab-ce-3238dc8654949de6ad073ccab2cc61e4da249cd3.tar.gz |
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
Diffstat (limited to 'app')
-rw-r--r-- | app/controllers/boards/issues_controller.rb | 13 | ||||
-rw-r--r-- | app/models/label.rb | 7 |
2 files changed, 15 insertions, 5 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 diff --git a/app/models/label.rb b/app/models/label.rb index 958141a7358..899028a01a0 100644 --- a/app/models/label.rb +++ b/app/models/label.rb @@ -127,7 +127,12 @@ class Label < ActiveRecord::Base end def priority(project) - priorities.find_by(project: project).try(:priority) + priority = if priorities.loaded? + priorities.first { |p| p.project == project } + else + priorities.find_by(project: project) + end + priority.try(:priority) end def template? |