diff options
| author | Jose <jvargas@gitlab.com> | 2018-06-04 11:29:22 -0500 |
|---|---|---|
| committer | Jose <jvargas@gitlab.com> | 2018-06-04 11:29:22 -0500 |
| commit | f65305980e00979d21dd8a137ca8b50d39d28f75 (patch) | |
| tree | 9e59a99cd2811a2343ecfd889a3f5ea2cb65da1e | |
| parent | fe0ebf76c49e2512b211c5d43152275c536f7e3a (diff) | |
| download | gitlab-ce-jivl-add-top-margin-related-merge-requests.tar.gz | |
Add top margin to the related merge requests sectionjivl-add-top-margin-related-merge-requests
| -rw-r--r-- | app/views/projects/issues/_merge_requests.html.haml | 65 |
1 files changed, 33 insertions, 32 deletions
diff --git a/app/views/projects/issues/_merge_requests.html.haml b/app/views/projects/issues/_merge_requests.html.haml index 5c36d2202a6..6aa3d4fb81f 100644 --- a/app/views/projects/issues/_merge_requests.html.haml +++ b/app/views/projects/issues/_merge_requests.html.haml @@ -1,35 +1,36 @@ - if @merge_requests.any? - %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) + .prepend-top-10 + %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} |