diff options
author | Greg Smethells <smethells@icloud.com> | 2015-12-04 13:00:07 -0600 |
---|---|---|
committer | Greg Smethells <smethells@icloud.com> | 2015-12-11 10:14:55 -0600 |
commit | 0272f27401d25faed97419611a78a968f801a42f (patch) | |
tree | 0141c7f7fbc2565fc3689bf84f60524ca8f02481 /app/views/projects/issues/show.html.haml | |
parent | a2a68858c88151ce0d77f602dbae59d595495ac6 (diff) | |
download | gitlab-ce-0272f27401d25faed97419611a78a968f801a42f.tar.gz |
display referenced merge requests in issue description with CI statusgsmethells/gitlab-ce-mr-statuses
Diffstat (limited to 'app/views/projects/issues/show.html.haml')
-rw-r--r-- | app/views/projects/issues/show.html.haml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/views/projects/issues/show.html.haml b/app/views/projects/issues/show.html.haml index a78d20cc07e..38254403fa6 100644 --- a/app/views/projects/issues/show.html.haml +++ b/app/views/projects/issues/show.html.haml @@ -47,6 +47,10 @@ = markdown(@issue.description, cache_key: [@issue, "description"]) %textarea.hidden.js-task-list-field = @issue.description + + .merge-requests + = render 'merge_requests' + - if @closed_by_merge_requests.present? = render 'projects/issues/closed_by_box' .issue-discussion |