diff options
| author | James Lopez <james@jameslopez.es> | 2017-08-24 11:18:01 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-10-05 11:48:25 +0300 |
| commit | 149adcd1206ba3bebd20401bf45ef7e67ec690fb (patch) | |
| tree | fb1d44683323ff5118d7ce40ca84b8cbec8d11c2 /app/models/merge_request_diff.rb | |
| parent | b7dda44ea5a9384d212e809de0cb4c7d666d7391 (diff) | |
Fetch and map refs/pull to refs/merge-requests in the GH import
update MR diff
Diffstat (limited to 'app/models/merge_request_diff.rb')
| -rw-r--r-- | app/models/merge_request_diff.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/models/merge_request_diff.rb b/app/models/merge_request_diff.rb index 58050e1f438..cd20df8404a 100644 --- a/app/models/merge_request_diff.rb +++ b/app/models/merge_request_diff.rb @@ -55,7 +55,8 @@ class MergeRequestDiff < ActiveRecord::Base end def ensure_commit_shas - merge_request.fetch_ref + merge_request.fetch_ref unless merge_request.source_branch_head + self.start_commit_sha ||= merge_request.target_branch_sha self.head_commit_sha ||= merge_request.source_branch_sha self.base_commit_sha ||= find_base_sha |