summaryrefslogtreecommitdiff
path: root/changelogs
diff options
context:
space:
mode:
authorIan Baum <ibaum@gitlab.com>2018-02-17 16:50:08 +0000
committerIan Baum <ibaum@gitlab.com>2018-02-17 16:50:08 +0000
commitcd82683e79e3c1cffe28ff1cf458ee8d84577e69 (patch)
tree0ca57cbb0a2e4167482238a4070c803c62ee9763 /changelogs
parent35ee6307399f1d92b90183a83cdf4b77a4d601f9 (diff)
parent1a6dbaefb1948d81438f1d50f93deabcc59a43eb (diff)
downloadgitlab-ce-cd82683e79e3c1cffe28ff1cf458ee8d84577e69.tar.gz
Merge branch 'revert-215dff76' into 'master'
Revert "Merge branch 'expired-ci-artifacts' into 'master'" See merge request gitlab-org/gitlab-ce!17193
Diffstat (limited to 'changelogs')
-rw-r--r--changelogs/unreleased/expired-ci-artifacts.yml5
1 files changed, 0 insertions, 5 deletions
diff --git a/changelogs/unreleased/expired-ci-artifacts.yml b/changelogs/unreleased/expired-ci-artifacts.yml
deleted file mode 100644
index 2fcbdb02f84..00000000000
--- a/changelogs/unreleased/expired-ci-artifacts.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Change SQL for expired artifacts to use new ci_job_artifacts.expire_at
-merge_request: 16578
-author:
-type: performance