diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2018-06-04 11:00:00 +0000 |
---|---|---|
committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-06-04 11:00:00 +0000 |
commit | b7244e038139a5c5d6107a776a096a558a403573 (patch) | |
tree | e0d522f65d405736855731a0c4770ca85a2be4d6 /changelogs/unreleased/sh-fix-secrets-not-working.yml | |
parent | 8008442829ea797b822d7c782334f6b2d319ca86 (diff) | |
parent | 0b4f9ff4068af6776b495d9332aeecf58e48786f (diff) | |
download | gitlab-ce-b7244e038139a5c5d6107a776a096a558a403573.tar.gz |
Merge branch 'master' into 'dm-gitlab-shell-7-1-4'dm-gitlab-shell-7-1-4
# Conflicts:
# GITLAB_SHELL_VERSION
Diffstat (limited to 'changelogs/unreleased/sh-fix-secrets-not-working.yml')
-rw-r--r-- | changelogs/unreleased/sh-fix-secrets-not-working.yml | 5 |
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 |