diff options
author | Rémy Coutable <remy@rymai.me> | 2016-07-20 14:28:57 +0300 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2016-07-20 14:28:57 +0300 |
commit | 8e6fa5937be35b3b1c0907911ec9a961ccd23935 (patch) | |
tree | 4958a8aa9294d38844201a6c8c5e3dcc71e9fb68 /CHANGELOG | |
parent | c1f0b7fcf0a28110ed4465a8afed254a4e33d5ee (diff) | |
parent | d7ab81cf7d89f3edf6515f7d954e376029a17b88 (diff) |
Merge branch 'regression/cron_jobs_validation' into 'master'
Log cron_jobs configuration instead of raising exception
## What does this MR do?
Log cron_jobs configuration errors and remove invalid key <-> values from the configuration hash instead of raising an exception.
This has been discussed at #20010.
Fixes #20010
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
Original implementation !5318, introduced a regression with our docker packaging: #20010.
## What are the relevant issue numbers?
* #20010
* #18378
## Does this MR meet the acceptance criteria?
- [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
- [ ] Added for this feature/bug
- [ ] All builds are passing
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [ ] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
See merge request !5360
Diffstat (limited to 'CHANGELOG')
-rw-r--r-- | CHANGELOG | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index 1abc4afdddd..e9c86cc0bf3 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -128,7 +128,7 @@ v 8.10.0 (unreleased) - Fix last update timestamp on issues not preserved on gitlab.com and project imports - Fix issues importing projects from EE to CE - Fix creating group with space in group path - - Improve cron_jobs loading error messages !5318 + - Improve cron_jobs loading error messages !5318 / !5360 - Create Todos for Issue author when assign or mention himself (Katarzyna Kobierska) - Limit the number of retries on error to 3 for exporting projects - Allow empty repositories on project import/export |