diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-04 00:09:00 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-04 00:09:00 +0300 |
| commit | 71c9d577ad563572050335dc261ba7673e3e566f (patch) | |
| tree | dcb4bb47b2d843de160feffe26dcefe20403f3fc /changelogs | |
| parent | 63a015fd85ae35634eb882d0078e65d80300816c (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'changelogs')
| -rw-r--r-- | changelogs/unreleased/archive-404.yml | 5 | ||||
| -rw-r--r-- | changelogs/unreleased/eb-no-keep-report-artifacts.yml | 5 | ||||
| -rw-r--r-- | changelogs/unreleased/fix-merge-train-race-condition.yml | 5 |
3 files changed, 15 insertions, 0 deletions
diff --git a/changelogs/unreleased/archive-404.yml b/changelogs/unreleased/archive-404.yml new file mode 100644 index 00000000000..2d017c3a302 --- /dev/null +++ b/changelogs/unreleased/archive-404.yml @@ -0,0 +1,5 @@ +--- +title: Return 404 when repository archive cannot be retrieved +merge_request: 23926 +author: +type: fixed diff --git a/changelogs/unreleased/eb-no-keep-report-artifacts.yml b/changelogs/unreleased/eb-no-keep-report-artifacts.yml new file mode 100644 index 00000000000..55dc26ae5df --- /dev/null +++ b/changelogs/unreleased/eb-no-keep-report-artifacts.yml @@ -0,0 +1,5 @@ +--- +title: Remove keep button for non archive artifacts +merge_request: 23762 +author: +type: fixed diff --git a/changelogs/unreleased/fix-merge-train-race-condition.yml b/changelogs/unreleased/fix-merge-train-race-condition.yml new file mode 100644 index 00000000000..c2990ecf84a --- /dev/null +++ b/changelogs/unreleased/fix-merge-train-race-condition.yml @@ -0,0 +1,5 @@ +--- +title: Use state machine in Merge Train to avoid race conditions +merge_request: 23395 +author: +type: fixed |