Merge branch 'master' into dirceu/gitlab-ce-new-merge-request-from-file-edit

da7d4f84 · Douwe Maan · e86d53b2 · a5a57452 · da7d4f84
Commit da7d4f84 authored Nov 18, 2015 by Douwe Maan
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

lib/gitlab/github_import/importer.rb lib/gitlab/github_import/importer.rb +1 -1

No files found.
--- 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