summaryrefslogtreecommitdiff
path: root/changelogs
diff options
context:
space:
mode:
authorNick Thomas <nick@gitlab.com>2018-09-25 15:16:03 +0000
committerNick Thomas <nick@gitlab.com>2018-09-25 15:16:03 +0000
commit0d2e3b56b1bc175ef1d348d01eb8dfa3ac206ccb (patch)
tree0f67cbbcfcdf3675f6822c346f215d9d4c6aab6b /changelogs
parenta615994fdba770262747e1f57409bb713a1fdf2b (diff)
parenta7e774566ef7bf66983581baae62ea3326d98317 (diff)
downloadgitlab-ce-0d2e3b56b1bc175ef1d348d01eb8dfa3ac206ccb.tar.gz
Merge branch 'enable-force-write-auth-keys-restore' into 'master'
Enable the ability to use the force env for rebuilding authorized_keys during a restore See merge request gitlab-org/gitlab-ce!21896
Diffstat (limited to 'changelogs')
-rw-r--r--changelogs/unreleased/enable-force-write-auth-keys-restore.yml5
1 files changed, 5 insertions, 0 deletions
diff --git a/changelogs/unreleased/enable-force-write-auth-keys-restore.yml b/changelogs/unreleased/enable-force-write-auth-keys-restore.yml
new file mode 100644
index 00000000000..f6c83cc7950
--- /dev/null
+++ b/changelogs/unreleased/enable-force-write-auth-keys-restore.yml
@@ -0,0 +1,5 @@
+---
+title: Enable the ability to use the force env for rebuilding authorized_keys during a restore
+merge_request: 21896
+author:
+type: fixed