summaryrefslogtreecommitdiff
path: root/doc/workflow
diff options
context:
space:
mode:
authorEvan Read <eread@gitlab.com>2019-05-07 03:23:44 +0000
committerEvan Read <eread@gitlab.com>2019-05-07 03:23:44 +0000
commitb32798ac41380e9e0167e1a98dfed7920ab360fd (patch)
tree71b1fdd52ca8524dbaea7fe4aae48ffd53853f4f /doc/workflow
parentcf5c8e73fb046e9db166f7115478d04d7774fd19 (diff)
parente10a3218d6631c130fe2ef42878193738cf76007 (diff)
downloadgitlab-ce-b32798ac41380e9e0167e1a98dfed7920ab360fd.tar.gz
Merge branch 'docs-destroy-the-mirrors' into 'master'
Correct repo mirror SSH key generation docs See merge request gitlab-org/gitlab-ce!27998
Diffstat (limited to 'doc/workflow')
-rw-r--r--doc/workflow/img/copy_ssh_public_key_button.pngbin0 -> 11225 bytes
-rw-r--r--doc/workflow/repository_mirroring.md6
2 files changed, 4 insertions, 2 deletions
diff --git a/doc/workflow/img/copy_ssh_public_key_button.png b/doc/workflow/img/copy_ssh_public_key_button.png
new file mode 100644
index 00000000000..e20dae09a4d
--- /dev/null
+++ b/doc/workflow/img/copy_ssh_public_key_button.png
Binary files differ
diff --git a/doc/workflow/repository_mirroring.md b/doc/workflow/repository_mirroring.md
index 9fcadbf3bee..2f8f1545b84 100644
--- a/doc/workflow/repository_mirroring.md
+++ b/doc/workflow/repository_mirroring.md
@@ -222,8 +222,10 @@ being injected into your mirror, or your password being stolen.
### SSH public key authentication
To use SSH public key authentication, you'll also need to choose that option
-from the **Authentication method** dropdown. GitLab will generate a 4096-bit RSA
-key and display the public component of that key to you.
+from the **Authentication method** dropdown. When the mirror is created,
+GitLab generates a 4096-bit RSA key that can be copied by clicking the **Copy SSH public key** button.
+
+![Repository mirroring copy SSH public key to clipboard button](img/copy_ssh_public_key_button.png)
You then need to add the public SSH key to the other repository's configuration: