summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <me@douwe.me>2015-11-18 12:14:55 +0100
committerDouwe Maan <me@douwe.me>2015-11-18 12:14:55 +0100
commitfe8bb1f196a01ecf3c96a4b6b1039d333454016e (patch)
tree1e301ca45c8f3a1aed64a65eee8e6838ba5fec07
parentdf6bb57921090ba9a9cfeb62cb012a503106389b (diff)
parente809669383d528e80d6408c4838566cf9f0bb8ac (diff)
downloadgitlab-ce-fe8bb1f196a01ecf3c96a4b6b1039d333454016e.tar.gz
Merge pull request #9838 from evindor/master
Fix github importer to handle empty issues
-rw-r--r--lib/gitlab/github_import/importer.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/github_import/importer.rb b/lib/gitlab/github_import/importer.rb
index bd7340a80f1..b5720f6e2cb 100644
--- a/lib/gitlab/github_import/importer.rb
+++ b/lib/gitlab/github_import/importer.rb
@@ -19,7 +19,7 @@ module Gitlab
if issue.pull_request.nil?
body = @formatter.author_line(issue.user.login)
- body += issue.body
+ body += issue.body || ""
if issue.comments > 0
body += @formatter.comments_header