diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-08-19 12:35:16 +0300 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-08-19 12:35:16 +0300 |
commit | e067e699c3250882ea08594243b6c6d3ad84d6e0 (patch) | |
tree | ff42f93262190df80671bd7ce873d46ec82171aa /app/models/merge_request_diff.rb | |
parent | a94553a90c16b58c9cc9d56488e3aa3c35b8d699 (diff) | |
download | gitlab-ce-e067e699c3250882ea08594243b6c6d3ad84d6e0.tar.gz |
Make sure merge request is fetched before collecting base sha in merge request diff
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/models/merge_request_diff.rb')
-rw-r--r-- | app/models/merge_request_diff.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/models/merge_request_diff.rb b/app/models/merge_request_diff.rb index a769d31ac93..42ab6b620bd 100644 --- a/app/models/merge_request_diff.rb +++ b/app/models/merge_request_diff.rb @@ -41,6 +41,7 @@ class MergeRequestDiff < ActiveRecord::Base end def ensure_commits_sha + merge_request.fetch_ref 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 |