From 051c0ec96f4f0a8c1cfff40be4504fdf1872cc9f Mon Sep 17 00:00:00 2001 From: Clement Ho Date: Tue, 5 Jun 2018 19:08:22 +0000 Subject: Revert "Merge branch 'jivl-add-top-margin-related-merge-requests' into 'master'" This reverts merge request !19379 --- .../projects/issues/_merge_requests.html.haml | 65 +++++++++++----------- 1 file changed, 32 insertions(+), 33 deletions(-) diff --git a/app/views/projects/issues/_merge_requests.html.haml b/app/views/projects/issues/_merge_requests.html.haml index 03a3cb8404f..5c36d2202a6 100644 --- a/app/views/projects/issues/_merge_requests.html.haml +++ b/app/views/projects/issues/_merge_requests.html.haml @@ -1,36 +1,35 @@ - if @merge_requests.any? - .prepend-top-default - %h2.merge-requests-title - = pluralize(@merge_requests.count, 'Related Merge Request') - %ul.unstyled-list.related-merge-requests - - has_any_head_pipeline = @merge_requests.any?(&:head_pipeline_id) - - @merge_requests.each do |merge_request| - %li - %span.merge-request-ci-status - - if merge_request.head_pipeline - = render_pipeline_status(merge_request.head_pipeline) - - elsif has_any_head_pipeline - = icon('blank fw') - %span.merge-request-id - = merge_request.to_reference - %span.merge-request-info - %strong - = link_to merge_request.title, merge_request_path(merge_request), class: "row_title" - - unless @issue.project.id == merge_request.target_project.id - in - - project = merge_request.target_project - = link_to project.full_name, project_path(project) + %h2.merge-requests-title + = pluralize(@merge_requests.count, 'Related Merge Request') + %ul.unstyled-list.related-merge-requests + - has_any_head_pipeline = @merge_requests.any?(&:head_pipeline_id) + - @merge_requests.each do |merge_request| + %li + %span.merge-request-ci-status + - if merge_request.head_pipeline + = render_pipeline_status(merge_request.head_pipeline) + - elsif has_any_head_pipeline + = icon('blank fw') + %span.merge-request-id + = merge_request.to_reference + %span.merge-request-info + %strong + = link_to merge_request.title, merge_request_path(merge_request), class: "row_title" + - unless @issue.project.id == merge_request.target_project.id + in + - project = merge_request.target_project + = link_to project.full_name, project_path(project) - - if merge_request.merged? - %span.merge-request-status.prepend-left-10.merged - Merged - - elsif merge_request.closed? - %span.merge-request-status.prepend-left-10.closed - Closed - - else - %span.merge-request-status.prepend-left-10.open - Open + - if merge_request.merged? + %span.merge-request-status.prepend-left-10.merged + Merged + - elsif merge_request.closed? + %span.merge-request-status.prepend-left-10.closed + Closed + - else + %span.merge-request-status.prepend-left-10.open + Open - - if @closed_by_merge_requests.present? - %li - = render partial: 'projects/issues/closed_by_box', locals: {merge_request_count: @merge_requests.count} + - if @closed_by_merge_requests.present? + %li + = render partial: 'projects/issues/closed_by_box', locals: {merge_request_count: @merge_requests.count} -- cgit v1.2.1