From d6f50f8af1e7adf6e1d38872c88d3c5b71dcfe01 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Sun, 23 Aug 2020 21:10:09 +0000
Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master

---
 app/assets/stylesheets/fontawesome_custom.scss               | 4 ----
 app/helpers/snippets_helper.rb                               | 2 +-
 ...eplace-fa-download-icon-with-gitlab-svg-download-icon.yml | 5 +++++
 doc/ssh/README.md                                            | 2 +-
 spec/helpers/snippets_helper_spec.rb                         | 2 +-
 5 files changed, 8 insertions(+), 7 deletions(-)
 create mode 100644 changelogs/unreleased/225888-replace-fa-download-icon-with-gitlab-svg-download-icon.yml

diff --git a/app/assets/stylesheets/fontawesome_custom.scss b/app/assets/stylesheets/fontawesome_custom.scss
index a2117e9c012..4ffcf84c790 100644
--- a/app/assets/stylesheets/fontawesome_custom.scss
+++ b/app/assets/stylesheets/fontawesome_custom.scss
@@ -250,10 +250,6 @@
   content: '\f06d';
 }
 
-.fa-download::before {
-  content: '\f019';
-}
-
 .fa-globe::before {
   content: '\f0ac';
 }
diff --git a/app/helpers/snippets_helper.rb b/app/helpers/snippets_helper.rb
index 10c95da394f..94c46feb8ae 100644
--- a/app/helpers/snippets_helper.rb
+++ b/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',
diff --git a/changelogs/unreleased/225888-replace-fa-download-icon-with-gitlab-svg-download-icon.yml b/changelogs/unreleased/225888-replace-fa-download-icon-with-gitlab-svg-download-icon.yml
new file mode 100644
index 00000000000..ef9d938639f
--- /dev/null
+++ b/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
diff --git a/doc/ssh/README.md b/doc/ssh/README.md
index b4b6f9a70e3..9e8d92c6cd9 100644
--- a/doc/ssh/README.md
+++ b/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),
diff --git a/spec/helpers/snippets_helper_spec.rb b/spec/helpers/snippets_helper_spec.rb
index 302122c3990..a3244bec56f 100644
--- a/spec/helpers/snippets_helper_spec.rb
+++ b/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
 
-- 
GitLab