diff options
| author | Yorick Peterse <yorickpeterse@gmail.com> | 2018-04-18 15:41:42 +0200 |
|---|---|---|
| committer | Yorick Peterse <yorickpeterse@gmail.com> | 2018-04-18 15:51:39 +0200 |
| commit | 6f292eaa69c771cec8a81d2edaad19a26ab3eae6 (patch) | |
| tree | 30ef0c062121834b2dca4f4a87bc7af72e071962 /app/models/label.rb | |
| parent | 019c0d5761b55ca21fd71d547dd4a2ebf14d615f (diff) | |
| download | gitlab-ce-6f292eaa69c771cec8a81d2edaad19a26ab3eae6.tar.gz | |
Revert the addition of goldiloader
This reverts the addition of the "goldiloader" Gem and all use of it.
While this Gem is very promising it's causing a variety of problems on
GitLab.com due to it eager-loading too much data in places where we
don't expect/can handle this. At least for the time being this means we
have to go back to manually fixing N+1 query problems, but at least
those should not cause a negative impact on availability.
Diffstat (limited to 'app/models/label.rb')
| -rw-r--r-- | app/models/label.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/label.rb b/app/models/label.rb index f3496884cff..de7f1d56c64 100644 --- a/app/models/label.rb +++ b/app/models/label.rb @@ -18,8 +18,8 @@ class Label < ActiveRecord::Base has_many :lists, dependent: :destroy # rubocop:disable Cop/ActiveRecordDependent has_many :priorities, class_name: 'LabelPriority' has_many :label_links, dependent: :destroy # rubocop:disable Cop/ActiveRecordDependent - has_many :issues, -> { auto_include(false) }, through: :label_links, source: :target, source_type: 'Issue' - has_many :merge_requests, -> { auto_include(false) }, through: :label_links, source: :target, source_type: 'MergeRequest' + has_many :issues, through: :label_links, source: :target, source_type: 'Issue' + has_many :merge_requests, through: :label_links, source: :target, source_type: 'MergeRequest' before_validation :strip_whitespace_from_title_and_color |