Add latest changes from gitlab-org/gitlab@master

app/assets/stylesheets/fontawesome_custom.scss

@@ -250,10 +250,6 @@
   content: '\f06d';
 }
 
-.fa-download::before {
-  content: '\f019';
-}
-
 .fa-globe::before {
   content: '\f0ac';
 }

app/helpers/snippets_helper.rb

@@ -12,7 +12,7 @@ module SnippetsHelper
   end
 
   def download_raw_snippet_button(snippet)
-    link_to(icon('download'),
+    link_to(sprite_icon('download'),
             gitlab_raw_snippet_path(snippet, inline: false),
             target: '_blank',
             rel: 'noopener noreferrer',

changelogs/unreleased/225888-replace-fa-download-icon-with-gitlab-svg-download-icon.yml

@@ -0,0 +1,5 @@
+---
+title: Replace fa-download icon with GitLab SVG download icon
+merge_request: 39849
+author:
+type: changed

doc/ssh/README.md

@@ -132,7 +132,7 @@ At this point, you'll see the following message in the command line (for ED25519
 
 ```plaintext
 Generating public/private ed25519 key pair.
-Enter file in which to save the key (/home/user/.ssh/id_rsa):
+Enter file in which to save the key (/home/user/.ssh/id_ed25519):
 ```
 
 If you don't already have an SSH key pair and are not generating a [deploy key](#deploy-keys),

spec/helpers/snippets_helper_spec.rb

@@ -109,7 +109,7 @@ RSpec.describe SnippetsHelper do
     end
 
     def download_link(url)
-      "<a target=\"_blank\" rel=\"noopener noreferrer\" class=\"btn btn-sm has-tooltip\" title=\"Download\" data-container=\"body\" href=\"#{url}?inline=false\"><i aria-hidden=\"true\" data-hidden=\"true\" class=\"fa fa-download\"></i></a>"
+      "<a target=\"_blank\" rel=\"noopener noreferrer\" class=\"btn btn-sm has-tooltip\" title=\"Download\" data-container=\"body\" href=\"#{url}?inline=false\">#{sprite_icon('download')}</a>"
     end
   end