Merge branch '225904-replace-fa-edit-icons-with-gitlab-svg-pencil-icon' into 'master'

Replace fa-edit + fa-lock icons with GitLab SVG pencil, lock icon

Closes #225896 and #225904

See merge request gitlab-org/gitlab!38456

app/assets/stylesheets/fontawesome_custom.scss

@@ -247,10 +247,6 @@
   content: '\f187';
 }
 
-.fa-lock::before {
-  content: '\f023';
-}
-
 .fa-sign-out::before {
   content: '\f08b';
 }
@@ -315,10 +311,6 @@
   content: '\f1b3';
 }
 
-.fa-edit::before {
-  content: '\f044';
-}
-
 .fa-times-circle::before {
   content: '\f057';
 }

app/helpers/snippets_helper.rb

@@ -60,9 +60,9 @@ module SnippetsHelper
   def snippet_badge(snippet)
     return unless attrs = snippet_badge_attributes(snippet)
 
-    css_class, text = attrs
+    icon_name, text = attrs
     tag.span(class: %w[badge badge-gray]) do
-      concat(tag.i(class: ['fa', css_class]))
+      concat(sprite_icon(icon_name, size: 14, css_class: 'gl-vertical-align-middle'))
       concat(' ')
       concat(text)
     end
@@ -70,7 +70,7 @@ module SnippetsHelper
 
   def snippet_badge_attributes(snippet)
     if snippet.private?
-      ['fa-lock', _('private')]
+      ['lock', _('private')]
     end
   end
 

app/views/projects/runners/_runner.html.haml

@@ -6,11 +6,12 @@
       = link_to _("%{token}...") % { token: runner.short_sha }, project_runner_path(@project, runner), class: 'commit-sha has-tooltip', title: _("Partial token for reference only")
 
       - if runner.locked?
-        = icon('lock', class: 'has-tooltip', title: _('Locked to current projects'))
+        %span.has-tooltip{ title: _('Locked to current projects') }
+          = sprite_icon('lock', size: 16)
 
       %small.edit-runner
-        = link_to edit_project_runner_path(@project, runner) do
-          %i.fa.fa-edit.btn
+        = link_to edit_project_runner_path(@project, runner), class: 'btn btn-edit' do
+          = sprite_icon('pencil', size: 16)
     - else
       %span.commit-sha
         = runner.short_sha

ee/app/views/projects/path_locks/_path_lock.html.haml

 %li{ data: { qa_selector: 'locked_file_content' } }
   %div
     %span.item-title{ data: { qa_selector: 'locked_file_title_content' } }
-      = icon('lock')
+      = sprite_icon('lock', size: 14, css_class: 'gl-mr-1 gl-vertical-align-middle')
       = path_lock.path
 
     .controls

spec/helpers/snippets_helper_spec.rb

@@ -122,7 +122,7 @@ RSpec.describe SnippetsHelper do
       let(:visibility) { :private }
 
       it 'returns the snippet badge' do
-        expect(subject).to eq "<span class=\"badge badge-gray\"><i class=\"fa fa-lock\"></i> private</span>"
+        expect(subject).to eq "<span class=\"badge badge-gray\">#{sprite_icon('lock', size: 14, css_class: 'gl-vertical-align-middle')} private</span>"
       end
     end