Merge branch...

Merge branch '233703-replace-bootstrap-alerts-in-app/views/projects/forks/error.html.haml' into 'master'

Replace bootstrap alerts in app/.../error.html.haml

Closes #233703

See merge request gitlab-org/gitlab!41292

app/helpers/projects_helper.rb

@@ -7,7 +7,7 @@ module ProjectsHelper
   end
   def link_to_project(project)
-    link_to namespace_project_path(namespace_id: project.namespace, id: project), title: h(project.name) do
+    link_to namespace_project_path(namespace_id: project.namespace, id: project), title: h(project.name), class: 'gl-link' do
       title = content_tag(:span, project.name, class: 'project-name')
       if project.namespace

app/views/projects/forks/error.html.haml

 - page_title _("Fork project")
 - if @forked_project && !@forked_project.saved?
-  .alert.alert-danger.alert-block
-    %h4
+  .gl-alert.gl-alert-danger.gl-mt-5
+    = sprite_icon('error', size: 16, css_class: 'gl-icon gl-alert-icon')
+    %h4.gl-alert-title
       = sprite_icon('fork')
       = _("Fork Error!")
-    %p
-      = _("You tried to fork %{link_to_the_project} but it failed for the following reason:").html_safe % { link_to_the_project: link_to_project(@project) }
-
-    - if @forked_project && @forked_project.errors.any?
+    .gl-alert-body
       %p
-        –
-        - error = @forked_project.errors.full_messages.first
-        - if error.include?("already been taken")
-          = _("Name has already been taken")
-        - else
-          = error
-    %p
-      = link_to _("Try to fork again"), new_project_fork_path(@project), title: _("Fork"), class: "btn"
+        = _("You tried to fork %{link_to_the_project} but it failed for the following reason:").html_safe % { link_to_the_project: link_to_project(@project) }
+
+      - if @forked_project && @forked_project.errors.any?
+        %p
+          –
+          - error = @forked_project.errors.full_messages.first
+          - if error.include?("already been taken")
+            = _("Name has already been taken")
+          - else
+            = error
+      .gl-alert-actions
+        = link_to _("Try to fork again"), new_project_fork_path(@project), title: _("Fork"), class: "btn gl-alert-action btn-info btn-md gl-button"

changelogs/unreleased/233703-replace-bootstrap-alerts-in-app-views-projects-forks-error-html-ha.yml

+---
+title: Replace bootstrap alerts in app/views/projects/forks/error.html.haml
+merge_request: 41292
+author: Gilang Gumilar
+type: changed