summaryrefslogtreecommitdiff
path: root/changelogs
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2018-01-09 11:21:23 +0000
committerDouwe Maan <douwe@gitlab.com>2018-01-09 11:21:23 +0000
commit2e4a1b3b78a76103198180acf873de8470d7cecf (patch)
treeda0c62bfc0eb8fbc1960330d6f8b3be91d986639 /changelogs
parent639cfdc221617f13ee08e673e0b5e51efc344744 (diff)
parent9edd9a5ea21a1b95ffc7b399c5c11bc9a7c4c318 (diff)
downloadgitlab-ce-2e4a1b3b78a76103198180acf873de8470d7cecf.tar.gz
Merge branch 'jej/backport-authorized-keys-to-ce' into 'master'
Backport authorized_keys Closes gitlab-ee#3953 See merge request gitlab-org/gitlab-ce!16014
Diffstat (limited to 'changelogs')
-rw-r--r--changelogs/unreleased/jej-backport-authorized-keys-to-ce.yml5
1 files changed, 5 insertions, 0 deletions
diff --git a/changelogs/unreleased/jej-backport-authorized-keys-to-ce.yml b/changelogs/unreleased/jej-backport-authorized-keys-to-ce.yml
new file mode 100644
index 00000000000..4386c631f59
--- /dev/null
+++ b/changelogs/unreleased/jej-backport-authorized-keys-to-ce.yml
@@ -0,0 +1,5 @@
+---
+title: Backport fast database lookup of SSH authorized_keys from EE
+merge_request: 16014
+author:
+type: added