Merge branch '43829-update-ssh-addtion-text' into 'master'

Resolve "SSH key add text" Closes #43829 See merge request gitlab-org/gitlab-ce!17527

Merge branch '43829-update-ssh-addtion-text' into 'master'
fd09e661 · Douwe Maan · 650d758f · 4990bcc5 · fd09e661 · fd09e661
Commit fd09e661 authored Mar 05, 2018 by Douwe Maan
Show whitespace changes
Inline Side-by-side

Showing with 8 additions and 1 deletion

index.html.haml app/views/profiles/keys/index.html.haml +3 -1

43829-update-ssh-addtion-text.yml changelogs/unreleased/43829-update-ssh-addtion-text.yml +5 -0

No files found.
--- a/app/views/profiles/keys/index.html.haml
+++ b/app/views/profiles/keys/index.html.haml
@@ -12,7 +12,9 @@
      Add an SSH key
    %p.profile-settings-content
      Before you can add an SSH key you need to
-      = link_to "generate it.", help_page_path("ssh/README")
+      = link_to "generate one", help_page_path("ssh/README", anchor: 'generating-a-new-ssh-key-pair')
+      or use an
+      = link_to "existing key.", help_page_path("ssh/README", anchor: 'locating-an-existing-ssh-key-pair')
    = render 'form'
    %hr
    %h5

--- a/changelogs/unreleased/43829-update-ssh-addtion-text.yml
+++ b/changelogs/unreleased/43829-update-ssh-addtion-text.yml
+---
+title: Update SSH key link to include existing keys
+merge_request:
+author: Brendan O'Leary
+type: changed