diff options
| author | George Koltsov <gkoltsov@gitlab.com> | 2019-07-11 16:09:51 +0100 |
|---|---|---|
| committer | George Koltsov <gkoltsov@gitlab.com> | 2019-07-11 16:09:51 +0100 |
| commit | 19dcb081d33f47378e45be30290876509e091e7a (patch) | |
| tree | ae953cc9c9743966467363bf749cb1b7d446dd23 /app | |
| parent | 3b42339068175cb6b7cd41aa68c7abad801b322e (diff) | |
| download | gitlab-ce-19dcb081d33f47378e45be30290876509e091e7a.tar.gz | |
Always return MR diff_refs if importing
This change fixes a bug that prevents projects being
imported when there are diff notes present in merge requests.
Solves https://gitlab.com/gitlab-org/gitlab-ce/issues/63955
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/merge_request.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 53977748c30..6e9b2ae5867 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -588,6 +588,8 @@ class MergeRequest < ApplicationRecord end def diff_refs + return merge_request_diff.diff_refs if importing? + persisted? ? merge_request_diff.diff_refs : repository_diff_refs end |