Update markup in merge_requests/invalid.html.haml

51b60a88 · Marvin Karegyeya · Phil Hughes · 8da3c665 · 51b60a88
Commit 51b60a88 authored Jun 08, 2021 by Marvin Karegyeya Committed by Phil Hughes Jun 08, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 19 additions and 17 deletions

app/views/projects/merge_requests/invalid.html.haml app/views/projects/merge_requests/invalid.html.haml +19 -17

No files found.
--- a/app/views/projects/merge_requests/invalid.html.haml
+++ b/app/views/projects/merge_requests/invalid.html.haml
@@ -8,21 +8,23 @@
  = render "projects/merge_requests/mr_box"
  .gl-alert.gl-alert-danger
-    = sprite_icon('error', size: 16, css_class: 'gl-icon gl-alert-icon gl-alert-icon-no-title')
+    .gl-alert-container
-    %p
+      = sprite_icon('error', size: 16, css_class: 'gl-icon gl-alert-icon gl-alert-icon-no-title')
-      We cannot render this merge request properly because
+      .gl-alert-content{ role: 'alert' }
-      - if @merge_request.for_fork? && !@merge_request.source_project
+        %p
-        fork project was removed
+          We cannot render this merge request properly because
-      - elsif !@merge_request.source_branch_exists?
+          - if @merge_request.for_fork? && !@merge_request.source_project
-        %span{ class: badge_inverse_css_classes }= @merge_request.source_branch
+            fork project was removed
-        does not exist in
+          - elsif !@merge_request.source_branch_exists?
-        %span{ class: badge_info_css_classes }= @merge_request.source_project_path
+            %span{ class: badge_inverse_css_classes }= @merge_request.source_branch
-      - elsif !@merge_request.target_branch_exists?
+            does not exist in
-        %span{ class: badge_inverse_css_classes }= @merge_request.target_branch
+            %span{ class: badge_info_css_classes }= @merge_request.source_project_path
-        does not exist in
+          - elsif !@merge_request.target_branch_exists?
-        %span{ class: badge_info_css_classes }= @merge_request.target_project_path
+            %span{ class: badge_inverse_css_classes }= @merge_request.target_branch
-      - else
+            does not exist in
-        of internal error
+            %span{ class: badge_info_css_classes }= @merge_request.target_project_path
+          - else
+            of internal error
-    %strong
+        %strong
-      Please close merge request or change branches with existing one
+          Please close merge request or change branches with existing one