diff options
| author | Luke Bennett <lukeeeebennettplus@gmail.com> | 2018-05-28 14:27:06 +0300 |
|---|---|---|
| committer | Luke Bennett <lukeeeebennettplus@gmail.com> | 2018-05-28 14:27:06 +0300 |
| commit | a9583bc9562512bd046a7f2c32fd267f32a5dac2 (patch) | |
| tree | af91d0688d49850746de400afdacb5389c0cfb16 /app/models/label.rb | |
| parent | a3e472e0a7a6b6ec5654edd20b947ba660ed2dc3 (diff) | |
| parent | 265b1fafe64ae9fe8a3e92d83c1678b47533ba86 (diff) | |
Merge remote-tracking branch 'origin/master' into 39549-label-list-page-redesign-with-draggable-labels
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 12e8c5695d4..1cf04976602 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 |