Commit da7d4f84 authored by Douwe Maan's avatar Douwe Maan

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

parents e86d53b2 a5a57452
...@@ -19,7 +19,7 @@ module Gitlab ...@@ -19,7 +19,7 @@ module Gitlab
if issue.pull_request.nil? if issue.pull_request.nil?
body = @formatter.author_line(issue.user.login) body = @formatter.author_line(issue.user.login)
body += issue.body body += issue.body || ""
if issue.comments > 0 if issue.comments > 0
body += @formatter.comments_header body += @formatter.comments_header
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment