diff options
| author | Douwe Maan <douwe@selenight.nl> | 2016-01-20 15:40:49 +0100 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2016-01-20 15:40:49 +0100 |
| commit | 987e3d94b017cb94f55cf47cdbb417c45adf0681 (patch) | |
| tree | 5cba8df1183a55f953d8e4abd6ab1715d6b984fa /app/models/merge_request.rb | |
| parent | a010db5db243a532cb8d1c2d5ac787e90da0044f (diff) | |
| download | gitlab-ce-987e3d94b017cb94f55cf47cdbb417c45adf0681.tar.gz | |
Fix MR diff_refs
Diffstat (limited to 'app/models/merge_request.rb')
| -rw-r--r-- | app/models/merge_request.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 9511521879b..0a890bbf6db 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -518,7 +518,7 @@ class MergeRequest < ActiveRecord::Base @ci_commit ||= source_project.ci_commit(last_commit.id) if last_commit && source_project end - def diff_range - [last_commit.parent, first_commit] + def diff_refs + [first_commit.parent || first_commit, last_commit] end end |