summaryrefslogtreecommitdiff
path: root/changelogs
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-01-11 15:07:49 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-01-11 15:07:49 +0000
commit90184b64bb3412cfd291b45c8997671cdb1ca95a (patch)
tree49accc148b0fa776d8a60c9e3a9224231b7ca393 /changelogs
parentbac547dc784170c7d0e6a5ae14d0ff5d549c31ee (diff)
downloadgitlab-ce-90184b64bb3412cfd291b45c8997671cdb1ca95a.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'changelogs')
-rw-r--r--changelogs/unreleased/15398-recurring-job.yml5
-rw-r--r--changelogs/unreleased/jl-bump-rack-cors-1-0-6.yml5
2 files changed, 10 insertions, 0 deletions
diff --git a/changelogs/unreleased/15398-recurring-job.yml b/changelogs/unreleased/15398-recurring-job.yml
new file mode 100644
index 00000000000..b19983e8183
--- /dev/null
+++ b/changelogs/unreleased/15398-recurring-job.yml
@@ -0,0 +1,5 @@
+---
+title: Add a cron job and worker to run the Container Expiration Policies
+merge_request: 21593
+author:
+type: added
diff --git a/changelogs/unreleased/jl-bump-rack-cors-1-0-6.yml b/changelogs/unreleased/jl-bump-rack-cors-1-0-6.yml
new file mode 100644
index 00000000000..70f03296768
--- /dev/null
+++ b/changelogs/unreleased/jl-bump-rack-cors-1-0-6.yml
@@ -0,0 +1,5 @@
+---
+title: Update rack-cors to 1.0.6
+merge_request: 22809
+author:
+type: security