summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrendan O'Leary 🐢 <boleary@gitlab.com>2018-03-05 19:19:21 +0000
committerDouwe Maan <douwe@gitlab.com>2018-03-05 19:19:21 +0000
commit4990bcc51036a0e0423261a4c846d1afdad3898c (patch)
treec624a66d9f9c7d86512d78a65a1a848548654460
parent650d758f056237a46b5be3cae13d4f4c9e07cbb8 (diff)
downloadgitlab-ce-4990bcc51036a0e0423261a4c846d1afdad3898c.tar.gz
Resolve "SSH key add text"
-rw-r--r--app/views/profiles/keys/index.html.haml4
-rw-r--r--changelogs/unreleased/43829-update-ssh-addtion-text.yml5
2 files changed, 8 insertions, 1 deletions
diff --git a/app/views/profiles/keys/index.html.haml b/app/views/profiles/keys/index.html.haml
index 457583cfd35..1e206def7ee 100644
--- 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
diff --git a/changelogs/unreleased/43829-update-ssh-addtion-text.yml b/changelogs/unreleased/43829-update-ssh-addtion-text.yml
new file mode 100644
index 00000000000..b7052bb171e
--- /dev/null
+++ b/changelogs/unreleased/43829-update-ssh-addtion-text.yml
@@ -0,0 +1,5 @@
+---
+title: Update SSH key link to include existing keys
+merge_request:
+author: Brendan O'Leary
+type: changed