summaryrefslogtreecommitdiff
path: root/changelogs/unreleased/17849-allow-admin-to-restrict-min-key-length-and-techno.yml
diff options
context:
space:
mode:
authorSimon Knox <psimyn@gmail.com>2017-10-03 08:41:33 +1100
committerSimon Knox <psimyn@gmail.com>2017-10-03 08:41:33 +1100
commitd54983885bee00ff7b49c4352639beca4a082f46 (patch)
tree24c684554dfbfcc1a1fb3aa70b51f1ffdf041a48 /changelogs/unreleased/17849-allow-admin-to-restrict-min-key-length-and-techno.yml
parent06b31461f34bac86d31d898e4f0e5b573d6b0345 (diff)
parent0781e956e4a4174494aa28b62b8dfc92a92e8e84 (diff)
downloadgitlab-ce-d54983885bee00ff7b49c4352639beca4a082f46.tar.gz
Merge remote-tracking branch 'origin' into 37229-mr-widget-status-icon
Diffstat (limited to 'changelogs/unreleased/17849-allow-admin-to-restrict-min-key-length-and-techno.yml')
-rw-r--r--changelogs/unreleased/17849-allow-admin-to-restrict-min-key-length-and-techno.yml5
1 files changed, 0 insertions, 5 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
deleted file mode 100644
index 8ec78bbd41f..00000000000
--- a/changelogs/unreleased/17849-allow-admin-to-restrict-min-key-length-and-techno.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Add settings for minimum SSH key strength and allowed key type
-merge_request: 13712
-author: Cory Hinshaw
-type: added