diff options
Diffstat (limited to 'app/models/merge_request_diff.rb')
| -rw-r--r-- | app/models/merge_request_diff.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/models/merge_request_diff.rb b/app/models/merge_request_diff.rb index fa633a1a725..ffe95e8f034 100644 --- a/app/models/merge_request_diff.rb +++ b/app/models/merge_request_diff.rb @@ -560,6 +560,10 @@ class MergeRequestDiff < ApplicationRecord opening_external_diff do collection = merge_request_diff_files + if options[:include_context_commits] + collection += merge_request.merge_request_context_commit_diff_files + end + if paths = options[:paths] collection = collection.where('old_path IN (?) OR new_path IN (?)', paths, paths) end |