diff options
| author | Sean McGivern <sean@gitlab.com> | 2018-04-18 12:58:46 +0100 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2018-04-18 13:03:32 +0100 |
| commit | 7fdf65ad61a5d7fad92c6c031bf70aa55689a264 (patch) | |
| tree | 69f4478bd92aad492b990d957844cd07f4553cb5 | |
| parent | 019c0d5761b55ca21fd71d547dd4a2ebf14d615f (diff) | |
| download | gitlab-ce-skip-auto-loading-for-diffs-and-commits.tar.gz | |
Skip autoloading for MR commits and diffsskip-auto-loading-for-diffs-and-commits
| -rw-r--r-- | app/models/merge_request_diff.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/merge_request_diff.rb b/app/models/merge_request_diff.rb index c1c27ccf3e5..a50390b409b 100644 --- a/app/models/merge_request_diff.rb +++ b/app/models/merge_request_diff.rb @@ -13,8 +13,8 @@ class MergeRequestDiff < ActiveRecord::Base belongs_to :merge_request manual_inverse_association :merge_request, :merge_request_diff - has_many :merge_request_diff_files, -> { order(:merge_request_diff_id, :relative_order) } - has_many :merge_request_diff_commits, -> { order(:merge_request_diff_id, :relative_order) } + has_many :merge_request_diff_files, -> { auto_include(false).order(:merge_request_diff_id, :relative_order) } + has_many :merge_request_diff_commits, -> { auto_include(false).order(:merge_request_diff_id, :relative_order) } state_machine :state, initial: :empty do state :collected |