Add top margin to the related merge requests section

5347155b · Jose · 53811074 · 5347155b
Commit 5347155b authored Jun 04, 2018 by Jose
Hide whitespace changes
Inline Side-by-side

Showing with 33 additions and 32 deletions

app/views/projects/issues/_merge_requests.html.haml app/views/projects/issues/_merge_requests.html.haml +33 -32

No files found.
--- a/app/views/projects/issues/_merge_requests.html.haml
+++ b/app/views/projects/issues/_merge_requests.html.haml
 - if @merge_requests.any?
-  %h2.merge-requests-title
+  .prepend-top-default
-    = pluralize(@merge_requests.count, 'Related Merge Request')
+    %h2.merge-requests-title
-  %ul.unstyled-list.related-merge-requests
+      = pluralize(@merge_requests.count, 'Related Merge Request')
-    - has_any_head_pipeline = @merge_requests.any?(&:head_pipeline_id)
+    %ul.unstyled-list.related-merge-requests
-    - @merge_requests.each do |merge_request|
+      - has_any_head_pipeline = @merge_requests.any?(&:head_pipeline_id)
-      %li
+      - @merge_requests.each do |merge_request|
-        %span.merge-request-ci-status
+        %li
-          - if merge_request.head_pipeline
+          %span.merge-request-ci-status
-            = render_pipeline_status(merge_request.head_pipeline)
+            - if merge_request.head_pipeline
-          - elsif has_any_head_pipeline
+              = render_pipeline_status(merge_request.head_pipeline)
-            = icon('blank fw')
+            - elsif has_any_head_pipeline
-        %span.merge-request-id
+              = icon('blank fw')
-          = merge_request.to_reference
+          %span.merge-request-id
-        %span.merge-request-info
+            = merge_request.to_reference
-          %strong
+          %span.merge-request-info
-            = link_to merge_request.title, merge_request_path(merge_request), class: "row_title"
+            %strong
-          - unless @issue.project.id == merge_request.target_project.id
+              = link_to merge_request.title, merge_request_path(merge_request), class: "row_title"
-            in
+            - unless @issue.project.id == merge_request.target_project.id
-            - project = merge_request.target_project
+              in
-            = link_to project.full_name, project_path(project)
+              - project = merge_request.target_project
+              = link_to project.full_name, project_path(project)
-        - if merge_request.merged?
+          - if merge_request.merged?
-          %span.merge-request-status.prepend-left-10.merged
+            %span.merge-request-status.prepend-left-10.merged
-            Merged
+              Merged
-        - elsif merge_request.closed?
+          - elsif merge_request.closed?
-          %span.merge-request-status.prepend-left-10.closed
+            %span.merge-request-status.prepend-left-10.closed
-            Closed
+              Closed
-        - else
+          - else
-          %span.merge-request-status.prepend-left-10.open
+            %span.merge-request-status.prepend-left-10.open
-            Open
+              Open
-    - if @closed_by_merge_requests.present?
+      - if @closed_by_merge_requests.present?
-      %li
+        %li
-        = render partial: 'projects/issues/closed_by_box', locals: {merge_request_count: @merge_requests.count}
+          = render partial: 'projects/issues/closed_by_box', locals: {merge_request_count: @merge_requests.count}