summaryrefslogtreecommitdiff
path: root/CHANGELOG.md
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-12-27 13:54:38 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-12-27 13:54:38 +0000
commit272db3dfc52c94772f59d25ac10bba624bffa9cb (patch)
treef0f8dc4ccf73adfad2032a4ff14bac64ebf7d683 /CHANGELOG.md
parentf444f745544528accf5811bb9a8fb0a252775d3b (diff)
downloadgitlab-ce-272db3dfc52c94772f59d25ac10bba624bffa9cb.tar.gz
Add latest changes from gitlab-org/gitlab@12-6-stable-ee
Diffstat (limited to 'CHANGELOG.md')
-rw-r--r--CHANGELOG.md12
1 files changed, 12 insertions, 0 deletions
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)