diff options
| author | Douwe Maan <douwe@selenight.nl> | 2017-04-06 17:13:28 -0500 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2017-04-08 14:37:46 -0500 |
| commit | 50eae640dbbfa42a42e8b6966bd739cfda3adabc (patch) | |
| tree | 1471ce67569d038e64a7e6f616d0d24be945aab9 /app/models/merge_request.rb | |
| parent | f47b737456f848784fddb5958c3fa781d2ede2f1 (diff) | |
| download | gitlab-ce-50eae640dbbfa42a42e8b6966bd739cfda3adabc.tar.gz | |
Fix specs and make tweaks
Diffstat (limited to 'app/models/merge_request.rb')
| -rw-r--r-- | app/models/merge_request.rb | 2 |
1 files changed, 1 insertions, 1 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] |