summaryrefslogtreecommitdiff
path: root/changelogs
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2018-06-04 08:37:53 +0000
committerDouwe Maan <douwe@gitlab.com>2018-06-04 08:37:53 +0000
commit414daf34e988390ab118a85c536187d15e6070bc (patch)
tree61b92b5a64b79b6c375cb16b65fd72cc9fc35dc8 /changelogs
parent9b20be45e99e9589626f47798e3565f102168b1f (diff)
parentca466d5d152e1a4f35ef044f344d8b7b33617db2 (diff)
downloadgitlab-ce-414daf34e988390ab118a85c536187d15e6070bc.tar.gz
Merge branch 'sh-fix-secrets-not-working' into 'master'
Fix attr_encryption key settings Closes #47166 See merge request gitlab-org/gitlab-ce!19341
Diffstat (limited to 'changelogs')
-rw-r--r--changelogs/unreleased/sh-fix-secrets-not-working.yml5
1 files changed, 5 insertions, 0 deletions
diff --git a/changelogs/unreleased/sh-fix-secrets-not-working.yml b/changelogs/unreleased/sh-fix-secrets-not-working.yml
new file mode 100644
index 00000000000..044a873ecd9
--- /dev/null
+++ b/changelogs/unreleased/sh-fix-secrets-not-working.yml
@@ -0,0 +1,5 @@
+---
+title: Fix attr_encryption key settings
+merge_request:
+author:
+type: fixed