diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-16 21:06:05 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-16 21:06:05 +0300 |
| commit | 930ff68c1efc380cb7522aa9b3884842eecb2486 (patch) | |
| tree | 208f21205f9c8ee90e9722c6f641169d9a1569bf /changelogs | |
| parent | 84727c8209a4412e21111a07f99b0438b03232de (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'changelogs')
| -rw-r--r-- | changelogs/unreleased/ms-implement-build-specific-timeout.yml | 5 | ||||
| -rw-r--r-- | changelogs/unreleased/update-rouge.yml | 5 |
2 files changed, 5 insertions, 5 deletions
diff --git a/changelogs/unreleased/ms-implement-build-specific-timeout.yml b/changelogs/unreleased/ms-implement-build-specific-timeout.yml new file mode 100644 index 00000000000..bc66b0b2fba --- /dev/null +++ b/changelogs/unreleased/ms-implement-build-specific-timeout.yml @@ -0,0 +1,5 @@ +--- +title: Allow specifying timeout per-job in .gitlab-ci.yml +merge_request: 16777 +author: Michał Siwek +type: added diff --git a/changelogs/unreleased/update-rouge.yml b/changelogs/unreleased/update-rouge.yml deleted file mode 100644 index 6f44de02d76..00000000000 --- a/changelogs/unreleased/update-rouge.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Update rouge to v3.10.0 -merge_request: 32745 -author: -type: other |