summaryrefslogtreecommitdiff
path: root/changelogs
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2018-12-06 18:53:24 -0600
committerRobert Speicher <rspeicher@gmail.com>2018-12-06 18:53:24 -0600
commit950b9130adcb4d2fa45bd1757c1b3dc50f1df9a4 (patch)
treea39525f22b03ba9587bcd3efc7d846e0b4406db6 /changelogs
parent9a78524f465488b2b5daa3fbdb2ec7c71c9641a6 (diff)
downloadgitlab-ce-950b9130adcb4d2fa45bd1757c1b3dc50f1df9a4.tar.gz
Revert "Merge branch 'fix/gb/encrypt-ci-build-token' into 'master'"
This reverts commit 1e8f1de034aa9b6a60b640b2b091f60c4d3ba365, reversing changes made to 62d971129da99936a3cdc04f3740d26f16a0c7a6.
Diffstat (limited to 'changelogs')
-rw-r--r--changelogs/unreleased/fix-gb-encrypt-ci-build-token.yml5
1 files changed, 0 insertions, 5 deletions
diff --git a/changelogs/unreleased/fix-gb-encrypt-ci-build-token.yml b/changelogs/unreleased/fix-gb-encrypt-ci-build-token.yml
deleted file mode 100644
index 04fc88bc3d3..00000000000
--- a/changelogs/unreleased/fix-gb-encrypt-ci-build-token.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Encrypt CI/CD builds authentication tokens
-merge_request: 23436
-author:
-type: security