Merge branch 'feature/rails-crash' into develop

2014-12-15 17:02:11 +02:00 · 2014-12-15 17:02:11 +02:00 · 5da838efee
commit 5da838efee
parent 73b789ab82 e29ff3c3a9
1 changed files with 5 additions and 1 deletions
--- a/lib/github_changelog_generator/generator.rb
+++ b/lib/github_changelog_generator/generator.rb
@ -10,7 +10,11 @@ module GitHubChangelogGenerator

      merge = "#{@options[:merge_prefix]}#{encapsulated_title} [\\##{pull_request[:number]}](#{pull_request.html_url})"
      if @options[:author]
+        if !pull_request.user.nil?
          merge += " ([#{pull_request.user.login}](#{pull_request.user.html_url}))\n\n"
+        else
+          merge += " ({Null user})\n\n"
+        end
      else
        merge += "\n\n"
      end