Commit c0d83121 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'extract-closing-issues' into 'master'

Fix error when viewing merge request with a commit that includes "Closes #<issue id>".

https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/488 was giving a 500 error, and the logs showed this was the error.

I'm not yet sure why project would be `nil` in this case, but that's another issue.

cc @rspeicher

See merge request !2
parents 1d3435d6 632a0c54
v 7.12 (Unreleased)
- Fix error when viewing merge request with a commit that includes "Closes #<issue id>".
v 7.11.2
- Fixed license upload and verification mechanism
......
......@@ -23,7 +23,7 @@ module Gitlab
end
def issues
if project.default_issues_tracker?
if project.nil? || project.default_issues_tracker?
result = pipeline_result(:issue)
elsif project.jira_tracker?
result = pipeline_result(:external_issue)
......
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