diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2019-07-15 15:46:59 +0000 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2019-07-15 15:46:59 +0000 |
| commit | 96277bb9d61b5aaf5c2edc388c5eabfc743478f0 (patch) | |
| tree | 97b8dd4c4b8f6f61ebca38c7e0253c35ec311007 /app | |
| parent | ca56311d0e8acde5417ec890c74cb684cf96af92 (diff) | |
| parent | ec512406857aecabc577b3fc70ec321982dd65a8 (diff) | |
| download | gitlab-ce-96277bb9d61b5aaf5c2edc388c5eabfc743478f0.tar.gz | |
Merge branch 'georgekoltsov/63955-fix-import-with-source-branch-deleted' into 'master'
Always return MR diff_refs if importing
See merge request gitlab-org/gitlab-ce!30630
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/merge_request.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 53977748c30..ba57fefd8f1 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -588,7 +588,11 @@ class MergeRequest < ApplicationRecord end def diff_refs - persisted? ? merge_request_diff.diff_refs : repository_diff_refs + if importing? || persisted? + merge_request_diff.diff_refs + else + repository_diff_refs + end end # Instead trying to fetch the |