diff options
| author | George Koltsov <gkoltsov@gitlab.com> | 2019-07-12 10:05:55 +0100 |
|---|---|---|
| committer | George Koltsov <gkoltsov@gitlab.com> | 2019-07-15 10:30:39 +0100 |
| commit | ec512406857aecabc577b3fc70ec321982dd65a8 (patch) | |
| tree | 6e63826c8b4129e0a19ddca879a018689d763996 /app/models/merge_request.rb | |
| parent | ebed862a78c5561bb497fefa041172b4c7440c45 (diff) | |
| download | gitlab-ce-ec512406857aecabc577b3fc70ec321982dd65a8.tar.gz | |
Add commit_id to AttributeCleaner::ALLOWED_REFERENCESgeorgekoltsov/63955-fix-import-with-source-branch-deleted
Diffstat (limited to 'app/models/merge_request.rb')
| -rw-r--r-- | app/models/merge_request.rb | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 6e9b2ae5867..ba57fefd8f1 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -588,9 +588,11 @@ class MergeRequest < ApplicationRecord end def diff_refs - return merge_request_diff.diff_refs if importing? - - 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 |