Merge branch '225931-replace-fa-gitlab-icon-with-gitlab-svg-tanuki-icon' into 'master'

Resolve "Replace fa-gitlab icon with GitLab SVG tanuki icon"

Closes #225931

See merge request gitlab-org/gitlab!36027

app/views/import/gitlab_projects/new.html.haml

 - page_title _("GitLab Import")
 - header_title _("Projects"), root_path
 
-%h3.page-title
-  = icon('gitlab')
+%h3.page-title.d-flex
+  .gl-display-flex.gl-align-items-center.gl-justify-content-center
+    = sprite_icon('tanuki', size: 16, css_class: 'gl-mr-2')
   = _('Import an exported GitLab project')
 %hr
 

app/views/projects/_import_project_pane.html.haml

@@ -9,7 +9,8 @@
       - if gitlab_project_import_enabled?
         .import_gitlab_project.has-tooltip{ data: { container: 'body' } }
           = link_to new_import_gitlab_project_path, class: 'btn btn_import_gitlab_project project-submit', **tracking_attrs(track_label, 'click_button', 'gitlab_export') do
-            = icon('gitlab', text: 'GitLab export')
+            = sprite_icon('tanuki')
+            = _("GitLab export")
 
       - if github_import_enabled?
         %div
@@ -32,7 +33,8 @@
         %div
           = link_to status_import_gitlab_path, class: "btn import_gitlab #{'how_to_import_link' unless gitlab_import_configured?}",
           **tracking_attrs(track_label, 'click_button', 'gitlab_com') do
-            = icon('gitlab', text: 'GitLab.com')
+            = sprite_icon('tanuki')
+            = _("GitLab.com")
           - unless gitlab_import_configured?
             = render 'projects/gitlab_import_modal'
 

locale/gitlab.pot

@@ -10822,6 +10822,9 @@ msgstr ""
 msgid "GitLab commit"
 msgstr ""
 
+msgid "GitLab export"
+msgstr ""
+
 msgid "GitLab for Slack"
 msgstr ""
 
@@ -10855,6 +10858,9 @@ msgstr ""
 msgid "GitLab will run a background job that will produce pseudonymized CSVs of the GitLab database that will be uploaded to your configured object storage directory."
 msgstr ""
 
+msgid "GitLab.com"
+msgstr ""
+
 msgid "GitLab.com import"
 msgstr ""