summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEtienne BaquƩ <ebaque@gitlab.com>2019-07-15 11:39:01 -0400
committerStan Hu <stanhu@gmail.com>2019-08-26 19:39:48 -0700
commit3e48d419318b319ba5629669472234ec7ecd77d8 (patch)
tree010d50155dcf2ce6406ce259828cc5be4bc8658c
parent93cf4124737b20e3f810f0c0ad366271a9a0c251 (diff)
downloadgitlab-ce-3e48d419318b319ba5629669472234ec7ecd77d8.tar.gz
Added changelog file for this security fix
-rw-r--r--changelogs/unreleased/63502-encrypt-deploy-token.yml5
-rw-r--r--config/database.yml.example0
2 files changed, 5 insertions, 0 deletions
diff --git a/changelogs/unreleased/63502-encrypt-deploy-token.yml b/changelogs/unreleased/63502-encrypt-deploy-token.yml
new file mode 100644
index 00000000000..249f52014cd
--- /dev/null
+++ b/changelogs/unreleased/63502-encrypt-deploy-token.yml
@@ -0,0 +1,5 @@
+---
+title: Encrypt existing deploy tokens and new ones when storing them
+merge_request: 30679
+author:
+type: security
diff --git a/config/database.yml.example b/config/database.yml.example
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/config/database.yml.example
+++ /dev/null