Merge branch 'main' into docs-chatbot

Author: MaedahBatool

docs/releases.mdx

@@ -20,6 +20,7 @@ Currently supported versions of Sourcegraph:
 | 6.1 Patch 2  | February 2025                 | ✅             | [Notes](https://sourcegraph.com/docs/technical-changelog#v611295)  | [Install](https://sourcegraph.com/docs/admin/deploy) |
 | 6.1 Patch 1  | February 2025                 | ✅             | [Notes](https://sourcegraph.com/docs/technical-changelog#v61376)   | [Install](https://sourcegraph.com/docs/admin/deploy) |
 | 6.1 Patch 0  | February 2025                 | ✅             | [Notes](https://sourcegraph.com/docs/technical-changelog#v610)     | [Install](https://sourcegraph.com/docs/admin/deploy) |
+| 6.0 Patch 2  | April 2025                    | ✅             | [Notes](https://sourcegraph.com/docs/technical-changelog#v6012741) | [Install](https://sourcegraph.com/docs/admin/deploy) |
 | 6.0 Patch 1  | February 2025                 | ✅             | [Notes](https://sourcegraph.com/docs/technical-changelog#v602687)  | [Install](https://sourcegraph.com/docs/admin/deploy) |
 | 6.0 Patch 0  | January 2025                  | ✅             | [Notes](https://sourcegraph.com/docs/technical-changelog#v600)     | [Install](https://sourcegraph.com/docs/admin/deploy) |
 | 5.11 Patch 5 | January 2025                  | ✅             | [Notes](https://sourcegraph.com/docs/technical-changelog#v5116271) | [Install](https://sourcegraph.com/docs/admin/deploy) |

docs/technical-changelog.mdx

@@ -1623,6 +1623,41 @@ Revert "fix: set the tag in the push_all.sh script" `(PR #2989)`
 
 {/* RSS={"version":"v6.1.0", "releasedAt": "2025-02-17"} */}
 
+# 6.0 Patch 2
+
+## v6.0.12741
+
+- [sourcegraph](https://github.com/sourcegraph/sourcegraph/releases/tag/v6.0.12741)
+
+- [docker-compose](https://github.com/sourcegraph/deploy-sourcegraph-docker/releases/tag/v6.0.12741)
+
+- [helm](https://github.com/sourcegraph/deploy-sourcegraph-helm/releases/tag/v6.0.12741)
+
+- [kustomize](https://github.com/sourcegraph/deploy-sourcegraph-k8s/releases/tag/v6.0.12741)
+
+### Features
+
+#### Dev
+
+- Enable gcloud beta `(PR #3490)`
+
+#### Release
+
+- Fix post-release version selection `(PR #4659)`
+
+#### Others
+
+- Update cody web to 0.31.1 to fix issue with pasting linebreaks (#3696) `(PR #3728)`
+- Fix: prompt templates should not fail when pasting linebreaks
+
+
+### Uncategorized
+
+#### Others
+
+- [Backport 6.0.x] security/fix: don't print access tokens `(PR #4801)`
+
+{/* RSS={"version":"v6.0.12741", "releasedAt": "2025-04-09"} */}
 
 # 6.0 Patch 1