diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-11-18 15:54:51 +0100 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-11-18 15:54:51 +0100 |
| commit | da7d4f849c0ea8fdae0d5dbe0bb903eeb1bd5492 (patch) | |
| tree | bd6921d06022eea6429b3b9aa740da47e1c0cfe8 | |
| parent | e86d53b27f6d46e818b6008d1274d1c4899a7a71 (diff) | |
| parent | a5a57452319eab4d9383c002defad324d8af1193 (diff) | |
| download | gitlab-ce-da7d4f849c0ea8fdae0d5dbe0bb903eeb1bd5492.tar.gz | |
Merge branch 'master' into dirceu/gitlab-ce-new-merge-request-from-file-edit
| -rw-r--r-- | lib/gitlab/github_import/importer.rb | 2 |
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 |