summaryrefslogtreecommitdiff
path: root/changelogs
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2017-09-01 19:23:08 +0000
committerRobert Speicher <robert@gitlab.com>2017-09-01 19:23:08 +0000
commit223849fa173b7059e717ba4f9c02075a452cbd49 (patch)
tree19dd9e840010234164a4461ac081889c07e05c9a /changelogs
parentdd825c0f5d00cef3cac89480bcf2027064c5d89d (diff)
parent29b40db58944a32db6cf1ae9906653a2e5f4be9d (diff)
downloadgitlab-ce-223849fa173b7059e717ba4f9c02075a452cbd49.tar.gz
Merge branch '17849-allow-admin-to-restrict-min-key-length-and-techno' into 'master'
Add settings for minimum key strength and allowed key type Closes #17849 See merge request !13712
Diffstat (limited to 'changelogs')
-rw-r--r--changelogs/unreleased/17849-allow-admin-to-restrict-min-key-length-and-techno.yml5
1 files changed, 5 insertions, 0 deletions
diff --git a/changelogs/unreleased/17849-allow-admin-to-restrict-min-key-length-and-techno.yml b/changelogs/unreleased/17849-allow-admin-to-restrict-min-key-length-and-techno.yml
new file mode 100644
index 00000000000..8ec78bbd41f
--- /dev/null
+++ b/changelogs/unreleased/17849-allow-admin-to-restrict-min-key-length-and-techno.yml
@@ -0,0 +1,5 @@
+---
+title: Add settings for minimum SSH key strength and allowed key type
+merge_request: 13712
+author: Cory Hinshaw
+type: added