diff options
Diffstat (limited to 'app/views/projects/issues/_merge_requests.html.haml')
-rw-r--r-- | app/views/projects/issues/_merge_requests.html.haml | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/app/views/projects/issues/_merge_requests.html.haml b/app/views/projects/issues/_merge_requests.html.haml index d6b38b327ff..d8075371853 100644 --- a/app/views/projects/issues/_merge_requests.html.haml +++ b/app/views/projects/issues/_merge_requests.html.haml @@ -2,12 +2,12 @@ %h2.merge-requests-title = pluralize(@merge_requests.count, 'Related Merge Request') %ul.unstyled-list - - has_any_ci = @merge_requests.any?(&:ci_commit) + - has_any_ci = @merge_requests.any?(&:pipeline) - @merge_requests.each do |merge_request| %li %span.merge-request-ci-status - - if merge_request.ci_commit - = render_ci_status(merge_request.ci_commit) + - if merge_request.pipeline + = render_pipeline_status(merge_request.pipeline) - elsif has_any_ci = icon('blank fw') %span.merge-request-id @@ -25,4 +25,5 @@ - elsif merge_request.closed? CLOSED - if @closed_by_merge_requests.present? - = render partial: 'projects/issues/closed_by_box', locals: {merge_request_count: @merge_requests.count} + %li + = render partial: 'projects/issues/closed_by_box', locals: {merge_request_count: @merge_requests.count} |