diff options
| -rw-r--r-- | CHANGELOG-EE.md | 4 | ||||
| -rw-r--r-- | CHANGELOG.md | 12 | ||||
| -rw-r--r-- | VERSION | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/121714-fix-sentry-stack-trace-highlight-for-php.yml | 5 | ||||
| -rw-r--r-- | changelogs/unreleased/alexives-119379-handle_http_error_instead_of_not_found.yml | 5 | ||||
| -rw-r--r-- | changelogs/unreleased/sh-optimize-pipeline-sql.yml | 5 |
6 files changed, 17 insertions, 16 deletions
diff --git a/CHANGELOG-EE.md b/CHANGELOG-EE.md index 7050d44cd88..dc4e390ebc8 100644 --- a/CHANGELOG-EE.md +++ b/CHANGELOG-EE.md @@ -1,5 +1,9 @@ Please view this file on the master branch, on stable branches it's out of date. +## 12.6.1 + +- No changes. + ## 12.6.0 ### Fixed (32 changes, 5 of them are from the community) diff --git a/CHANGELOG.md b/CHANGELOG.md index 391b60db091..2336cddc352 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,18 @@ documentation](doc/development/changelog.md) for instructions on adding your own entry. +## 12.6.1 + +### Fixed (2 changes) + +- Handle forbidden error when checking for knative. !22170 +- Fix stack trace highlight for PHP. !22258 + +### Performance (1 change) + +- Eliminate N+1 queries in PipelinesController#index. !22189 + + ## 12.6.0 ### Security (4 changes) @@ -1 +1 @@ -12.6.0-ee +12.6.1-ee diff --git a/changelogs/unreleased/121714-fix-sentry-stack-trace-highlight-for-php.yml b/changelogs/unreleased/121714-fix-sentry-stack-trace-highlight-for-php.yml deleted file mode 100644 index 4f3b80dfcaa..00000000000 --- a/changelogs/unreleased/121714-fix-sentry-stack-trace-highlight-for-php.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix stack trace highlight for PHP -merge_request: 22258 -author: -type: fixed diff --git a/changelogs/unreleased/alexives-119379-handle_http_error_instead_of_not_found.yml b/changelogs/unreleased/alexives-119379-handle_http_error_instead_of_not_found.yml deleted file mode 100644 index 6f5eea45660..00000000000 --- a/changelogs/unreleased/alexives-119379-handle_http_error_instead_of_not_found.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Handle forbidden error when checking for knative -merge_request: 22170 -author: -type: fixed diff --git a/changelogs/unreleased/sh-optimize-pipeline-sql.yml b/changelogs/unreleased/sh-optimize-pipeline-sql.yml deleted file mode 100644 index f40fff99454..00000000000 --- a/changelogs/unreleased/sh-optimize-pipeline-sql.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Eliminate N+1 queries in PipelinesController#index -merge_request: 22189 -author: -type: performance |