diff options
| author | Douwe Maan <douwe@selenight.nl> | 2017-05-15 13:44:15 -0500 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2017-05-23 15:37:43 -0500 |
| commit | bc4fec1fcbf848bec682b59f2f47b1648eee9b44 (patch) | |
| tree | e2f9e3f9512cb13b7c91a5a1e837dfd76b7ed06a /app/models/merge_request_diff.rb | |
| parent | 7c479d88a92233790bc0fb63146fe004f8b9b5d7 (diff) | |
| download | gitlab-ce-bc4fec1fcbf848bec682b59f2f47b1648eee9b44.tar.gz | |
Remove @commit in compare and MR controllers
Diffstat (limited to 'app/models/merge_request_diff.rb')
| -rw-r--r-- | app/models/merge_request_diff.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/app/models/merge_request_diff.rb b/app/models/merge_request_diff.rb index a6f3994166b..6d6c561976c 100644 --- a/app/models/merge_request_diff.rb +++ b/app/models/merge_request_diff.rb @@ -159,6 +159,9 @@ class MergeRequestDiff < ActiveRecord::Base # It is not good enough for highlighting diffs, so we can't simply pass # these as `diff_refs.` def fallback_diff_refs + real_refs = diff_refs + return real_refs if real_refs + likely_base_commit_sha = (first_commit&.parent || first_commit)&.sha Gitlab::Diff::DiffRefs.new( |