summaryrefslogtreecommitdiff
path: root/doc/security
diff options
context:
space:
mode:
authorTristan Williams <twilliams@gitlab.com>2019-02-22 16:55:43 +0000
committerMarcia Ramos <marcia@gitlab.com>2019-02-22 16:55:43 +0000
commit5829bf8578a7ba245a89dd75f05d0776fb53712a (patch)
treed58ba6419e5e62682479cc7bda6ecf900e69bb24 /doc/security
parenta77137041935a641ce9a84c9b723c6c1dbc3676a (diff)
downloadgitlab-ce-5829bf8578a7ba245a89dd75f05d0776fb53712a.tar.gz
Docs: add details about restricted SSH keys
Diffstat (limited to 'doc/security')
-rw-r--r--doc/security/img/ssh_keys_restricted_key_icon.pngbin0 -> 4887 bytes
-rw-r--r--doc/security/ssh_keys_restrictions.md8
2 files changed, 8 insertions, 0 deletions
diff --git a/doc/security/img/ssh_keys_restricted_key_icon.png b/doc/security/img/ssh_keys_restricted_key_icon.png
new file mode 100644
index 00000000000..ad3749e8233
--- /dev/null
+++ b/doc/security/img/ssh_keys_restricted_key_icon.png
Binary files differ
diff --git a/doc/security/ssh_keys_restrictions.md b/doc/security/ssh_keys_restrictions.md
index 213fa5bfef5..6b6a8a06cc9 100644
--- a/doc/security/ssh_keys_restrictions.md
+++ b/doc/security/ssh_keys_restrictions.md
@@ -17,3 +17,11 @@ In the Admin area under **Settings** (`/admin/application_settings`), look for
the "Visibility and Access Controls" area:
![SSH keys restriction admin settings](img/ssh_keys_restrictions_settings.png)
+
+If a restriction is imposed on any key type, users will be unable to upload new SSH keys that don't meet the requirement. Any existing keys that don't meet it will be disabled but not removed and users will be unable to pull or push code using them.
+
+An icon will be visible to the user of a restricted key in the SSH keys section of their profile:
+
+![Restricted SSH key icon](img/ssh_keys_restricted_key_icon.png)
+
+Hovering over this icon will tell you why the key is restricted.