diff options
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/merge_request.rb | 2 | ||||
| -rw-r--r-- | app/models/merge_request_diff.rb | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 95e41106b49..1e24c03e5b6 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -369,7 +369,7 @@ class MergeRequest < ActiveRecord::Base def merge_request_diff_for(diff_refs) @merge_request_diffs_by_diff_refs ||= Hash.new do |h, diff_refs| - h[diff_refs] = merge_request_diffs.viewable.select_without_diff.with_diff_refs(diff_refs).take + h[diff_refs] = merge_request_diffs.viewable.select_without_diff.find_by_diff_refs(diff_refs) end @merge_request_diffs_by_diff_refs[diff_refs] diff --git a/app/models/merge_request_diff.rb b/app/models/merge_request_diff.rb index bf9289086f0..3a26b4ee401 100644 --- a/app/models/merge_request_diff.rb +++ b/app/models/merge_request_diff.rb @@ -26,12 +26,15 @@ class MergeRequestDiff < ActiveRecord::Base end scope :viewable, -> { without_state(:empty) } - scope :with_diff_refs, ->(diff_refs) { where(start_commit_sha: diff_refs.start_sha, head_commit_sha: diff_refs.head_sha, base_commit_sha: diff_refs.base_sha) } # All diff information is collected from repository after object is created. # It allows you to override variables like head_commit_sha before getting diff. after_create :save_git_content, unless: :importing? + def self.find_by_diff_refs(diff_refs) + where(start_commit_sha: diff_refs.start_sha, head_commit_sha: diff_refs.head_sha, base_commit_sha: diff_refs.base_sha) + end + def self.select_without_diff select(column_names - ['st_diffs']) end |