diff options
| author | GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com> | 2019-12-03 11:20:21 +0000 |
|---|---|---|
| committer | GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com> | 2019-12-03 11:20:21 +0000 |
| commit | f033ece0f52017a15d17b7ad7f058163c90c3055 (patch) | |
| tree | 668d49a61c4b4ca311ab5bf73baca64e1e91eb51 | |
| parent | 662bb2b6f1f5b5730a0d1eaa66238e718468645d (diff) | |
| download | gitlab-ce-f033ece0f52017a15d17b7ad7f058163c90c3055.tar.gz | |
Update CHANGELOG.md for 12.5.3
[ci skip]
| -rw-r--r-- | CHANGELOG.md | 14 | ||||
| -rw-r--r-- | changelogs/unreleased/20668-crossplane-help-link.yml | 5 | ||||
| -rw-r--r-- | changelogs/unreleased/37313-scroll-to-bottom.yml | 5 | ||||
| -rw-r--r-- | changelogs/unreleased/bvl-fix-merging-through-push-options.yml | 5 | ||||
| -rw-r--r-- | changelogs/unreleased/sh-fix-api-project-template-creation.yml | 5 | ||||
| -rw-r--r-- | changelogs/unreleased/sh-flatten-json-exceptions.yml | 5 |
6 files changed, 14 insertions, 25 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index c2e333745f9..bd3dab0a3a2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,20 @@ documentation](doc/development/changelog.md) for instructions on adding your own entry. +## 12.5.3 + +### Fixed (4 changes) + +- Fix project creation with templates using /projects/user/:id API. !20590 +- Fix merging merge requests from push options. !20639 +- Fix Crossplane help link in cluster applications page. !20668 +- Fixes job log not scrolling to the bottom. + +### Changed (1 change) + +- Flatten exception details in API and controller logs. !20434 + + ## 12.5.2 ### Security (1 change) diff --git a/changelogs/unreleased/20668-crossplane-help-link.yml b/changelogs/unreleased/20668-crossplane-help-link.yml deleted file mode 100644 index dfce6602f5f..00000000000 --- a/changelogs/unreleased/20668-crossplane-help-link.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix Crossplane help link in cluster applications page -merge_request: 20668 -author: -type: fixed diff --git a/changelogs/unreleased/37313-scroll-to-bottom.yml b/changelogs/unreleased/37313-scroll-to-bottom.yml deleted file mode 100644 index d7251bd8100..00000000000 --- a/changelogs/unreleased/37313-scroll-to-bottom.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fixes job log not scrolling to the bottom -merge_request: -author: -type: fixed diff --git a/changelogs/unreleased/bvl-fix-merging-through-push-options.yml b/changelogs/unreleased/bvl-fix-merging-through-push-options.yml deleted file mode 100644 index cacf34a52ed..00000000000 --- a/changelogs/unreleased/bvl-fix-merging-through-push-options.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix merging merge requests from push options -merge_request: 20639 -author: -type: fixed diff --git a/changelogs/unreleased/sh-fix-api-project-template-creation.yml b/changelogs/unreleased/sh-fix-api-project-template-creation.yml deleted file mode 100644 index 787bd147c91..00000000000 --- a/changelogs/unreleased/sh-fix-api-project-template-creation.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix project creation with templates using /projects/user/:id API -merge_request: 20590 -author: -type: fixed diff --git a/changelogs/unreleased/sh-flatten-json-exceptions.yml b/changelogs/unreleased/sh-flatten-json-exceptions.yml deleted file mode 100644 index a312748d491..00000000000 --- a/changelogs/unreleased/sh-flatten-json-exceptions.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Flatten exception details in API and controller logs -merge_request: 20434 -author: -type: changed |