summaryrefslogtreecommitdiff
path: root/lib/gitlab/github_import/importer/pull_request_importer.rb
diff options
context:
space:
mode:
Diffstat (limited to 'lib/gitlab/github_import/importer/pull_request_importer.rb')
-rw-r--r--lib/gitlab/github_import/importer/pull_request_importer.rb3
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