summaryrefslogtreecommitdiff
path: root/changelogs
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzegorz@gitlab.com>2018-12-17 14:40:29 +0000
committerGrzegorz Bizon <grzegorz@gitlab.com>2018-12-17 14:40:29 +0000
commit73d4b1f625af4cb9e10c4e862ed63a54904f746f (patch)
tree36b59a4272a82ecf1feae9fc62f939669158851c /changelogs
parent75262862c434a98b9183a4a63f3ad86dec52b079 (diff)
parentc75c38f8ca21e0d77ef4d3d2befd299b9b6bccc5 (diff)
downloadgitlab-ce-73d4b1f625af4cb9e10c4e862ed63a54904f746f.tar.gz
Merge branch 'revert-1cccfca1' into 'master'
Revert "Merge branch 'auto_devops_kubernetes_active' into 'master'" See merge request gitlab-org/gitlab-ce!23826
Diffstat (limited to 'changelogs')
-rw-r--r--changelogs/unreleased/revert-1cccfca1.yml5
1 files changed, 5 insertions, 0 deletions
diff --git a/changelogs/unreleased/revert-1cccfca1.yml b/changelogs/unreleased/revert-1cccfca1.yml
new file mode 100644
index 00000000000..c1efdaac138
--- /dev/null
+++ b/changelogs/unreleased/revert-1cccfca1.yml
@@ -0,0 +1,5 @@
+---
+title: Restore kubernetes:active in Auto-DevOps.gitlab-ci.yml (reverts 22929)
+merge_request: 23826
+author:
+type: fixed