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/models | |
| 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/models')
| -rw-r--r-- | app/models/label.rb | 7 |
1 files changed, 6 insertions, 1 deletions
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? |