diff options
| author | Nick Thomas <nick@gitlab.com> | 2018-06-12 14:08:51 +0000 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2018-06-12 14:08:51 +0000 |
| commit | 893c824ed3f99d5c1f79f09acb12eac5ce5e159f (patch) | |
| tree | 05a8520e7a805b7f7720cc7dd1a7ee8c9af1335a /lib | |
| parent | 8b0d2283d77df0e99f5f49db3f78f6101ac1b8ef (diff) | |
| parent | e4612df0e257a27b47986a9ee6aa77f68a9cd3ba (diff) | |
| download | gitlab-ce-893c824ed3f99d5c1f79f09acb12eac5ce5e159f.tar.gz | |
Merge branch 'pr-importer-io-extra-error-handling' into 'master'
Ensure MR diffs always exist in the PR importer
Closes #47312
See merge request gitlab-org/gitlab-ce!19704
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/github_import/importer/pull_request_importer.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/gitlab/github_import/importer/pull_request_importer.rb b/lib/gitlab/github_import/importer/pull_request_importer.rb index b2f6cb7ad19..6b3688c4381 100644 --- a/lib/gitlab/github_import/importer/pull_request_importer.rb +++ b/lib/gitlab/github_import/importer/pull_request_importer.rb @@ -104,7 +104,8 @@ module Gitlab # first save the diff, then populate it. diff = if already_exists - merge_request.merge_request_diffs.take + merge_request.merge_request_diffs.take || + merge_request.merge_request_diffs.build else merge_request.merge_request_diffs.build end |