summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app/models/merge_request_diff.rb4
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