Add latest changes from gitlab-org/gitlab@12-6-stable-ee

CHANGELOG-EE.md

 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)

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)

VERSION

-12.6.0-ee
+12.6.1-ee

changelogs/unreleased/121714-fix-sentry-stack-trace-highlight-for-php.yml

----
-title: Fix stack trace highlight for PHP
-merge_request: 22258
-author:
-type: fixed

changelogs/unreleased/alexives-119379-handle_http_error_instead_of_not_found.yml

----
-title: Handle forbidden error when checking for knative
-merge_request: 22170
-author:
-type: fixed

changelogs/unreleased/sh-optimize-pipeline-sql.yml

----
-title: Eliminate N+1 queries in PipelinesController#index
-merge_request: 22189
-author:
-type: performance