Merge branch 'main' into main

Author: MaedahBatool

docs/admin/config/site_config.mdx

@@ -304,9 +304,12 @@ All site configuration options and their default values are shown below.
 	// Don't sync a user's permissions if they have synced within the last n seconds.
 	"permissions.syncUsersBackoffSeconds": 60,
 
-	// The maximum number of user-centric permissions syncing jobs that can be spawned concurrently. Service restart is required to take effect for changes.
+	// The maximum number of user-centric permissions syncing jobs that can be spawned concurrently. Server restart is required for changes to take effect.
 	"permissions.syncUsersMaxConcurrency": 1,
 
+	// The maximum number of repo-centric permissions syncing jobs that can be spawned concurrently. Server restart is required for changes to take effect.
+	"permissions.syncReposMaxConcurrency": 5,
+
 	"rateLimits": null,
 
 	// Enables redacting sensitive information from outbound requests. Important: We only respect this setting in development environments. In production, we always redact outbound requests.

docs/admin/permissions/syncing.mdx

@@ -253,10 +253,10 @@ scheduled. Default values are shown below:
   // Don't sync a repo's permissions if it has synced within the last n seconds.
   "permissions.syncReposBackoffSeconds": 60,
   // The maximum number of user-centric permissions syncing jobs that can be spawned concurrently.
-  // Service restart is required to take effect for changes.
+  // Server restart is required for changes to take effect.
   "permissions.syncUsersMaxConcurrency": 1,
   // The maximum number of repo-centric permissions syncing jobs that can be spawned concurrently.
-  // Service restart is required to take effect for changes.
+  // Server restart is required for changes to take effect.
   "permissions.syncReposMaxConcurrency": 5,
 }
 ```

docs/admin/updates/kubernetes.mdx

@@ -4,7 +4,7 @@ This page lists the changes that are relevant for upgrading Sourcegraph on **Kub
 
 For upgrade procedures or general info about sourcegraph versioning see the links below:
 - [Kubernetes Kustomize Upgrade Procedures](/admin/deploy/kubernetes/upgrade)
-- [Kubernetes Helm Upgrade Procedures](/admin/deploy/kubernetes/helm#upgrading-sourcegraph)
+- [Kubernetes Helm Upgrade Procedures](/admin/deploy/kubernetes#upgrading-sourcegraph)
 - [General Upgrade Info](/admin/updates)
 - [Technical changelog](/technical-changelog)
 

docs/api/stream_api/index.mdx

@@ -60,8 +60,9 @@ data: {}
 ```
 
 > NOTE:
-> Our format is a subset of the event stream format for [server-sent
-> events](https://developer.mozilla.org/en-US/docs/Web/API/Server-sent_events/Using_server-sent_events#event_stream_format). However, we do not guarantee compatibility with any third-party clients written for server-sent events.
+> The search stream API follows the [server-sent
+> events](https://developer.mozilla.org/en-US/docs/Web/API/Server-sent_events/Using_server-sent_events#event_stream_format) format. However, we do not guarantee compatibility
+> with any third-party clients written for server-sent events, and recommend using the src-cli tool or writing your own wrapper around the API.
 
 ### Event-types
 

docs/code-search/index.mdx

@@ -10,7 +10,7 @@
 
 Sourcegraph's Code Search empowers you to:
 
-- Utilize regular expressions, boolean operations, and keyboard shortcuts helps you unleash the full potential of your searches
+- Utilize regular expressions, boolean operations, and keyboard shortcuts to help you unleash the full potential of your searches
 - With the symbol, commit, and diff search capabilities, it identifies code vulnerabilities in milliseconds and quickly helps you resolve issues and incidents
 - Offers innovative code view with seamless code navigation for a comprehensive coding experience
 

docs/code-search/types/search-jobs.mdx

@@ -17,8 +17,9 @@ To use Search Jobs, you need to:
 
 - If your query is valid, click **Create a search job** to initiate the search job
 - You will be redirected to the "Search Jobs UI" page at `/search-jobs`, where you can view all your created search jobs. If you're a site admin, you can also view search jobs from other users on the instance
+- For each search job, you can download the results by clicking the **Download** button. The results are formatted as JSON lines, see [Search results format](#search-results-format) for more details.
 
-![view-search-jobs](https://storage.googleapis.com/sourcegraph-assets/Docs/search-jobs/search-jobs-manage.png)
+![view-search-jobs](https://storage.googleapis.com/sourcegraph-assets/Docs/search-jobs/search-jobs-manage-with-frame.png)
 
 ## Search results format
 

docs/cody/troubleshooting.mdx

@@ -224,6 +224,10 @@ $filteredResults = preg_grep('*\.' . basename($inputPath) . '\.*', $fileList);
 ```
 ````
 
+## Forked Repos As Context
+
+If you would like to add a forked repository as Cody context, you may need to add `"search.includeForks": true` to the [global settings](/admin/config/settings#editing-global-settings-for-site-admins) for your instance.
+
 ## Eclipse extension
 
 ### See a white screen the first time you open Cody chat

docs/releases.mdx

@@ -12,6 +12,9 @@ Currently supported versions of Sourcegraph:
 
 | **Release**  | **General Availability Date** | **Supported** | **Release Notes**                                                  | **Install**                                          |
 |--------------|-------------------------------|---------------|--------------------------------------------------------------------|------------------------------------------------------|
+| 5.11 Patch 3 | January 2025                  | ✅             | [Notes](https://sourcegraph.com/docs/technical-changelog#v5114013) | [Install](https://sourcegraph.com/docs/admin/deploy) |
+| 5.11 Patch 2 | January 2025                  | ✅             | [Notes](https://sourcegraph.com/docs/technical-changelog#v5113601) | [Install](https://sourcegraph.com/docs/admin/deploy) |
+| 5.11 Patch 1 | January 2025                  | ✅             | [Notes](https://sourcegraph.com/docs/technical-changelog#v5112732) | [Install](https://sourcegraph.com/docs/admin/deploy) |
 | 5.11 Patch 0 | December 2024                 | ✅             | [Notes](https://sourcegraph.com/docs/technical-changelog#v5110)    | [Install](https://sourcegraph.com/docs/admin/deploy) |
 | 5.10 Patch 3 | December 2024                 | ✅             | [Notes](https://sourcegraph.com/docs/technical-changelog#v5103940) | [Install](https://sourcegraph.com/docs/admin/deploy) |
 | 5.10 Patch 2 | December 2024                 | ✅             | [Notes](https://sourcegraph.com/docs/technical-changelog#v5102832) | [Install](https://sourcegraph.com/docs/admin/deploy) |

docs/technical-changelog.mdx

@@ -4,6 +4,111 @@ This page documents all notable changes to Sourcegraph. For more detailed change
 
 {/* CHANGELOG_START */}
 
+# 5.11 Patch 3
+
+## v5.11.4013
+
+- [sourcegraph](https://github.com/sourcegraph/sourcegraph/releases/tag/v5.11.4013)
+
+- [docker-compose](https://github.com/sourcegraph/deploy-sourcegraph-docker/releases/tag/v5.11.4013)
+
+- [helm](https://github.com/sourcegraph/deploy-sourcegraph-helm/releases/tag/v5.11.4013)
+
+- [kustomize](https://github.com/sourcegraph/deploy-sourcegraph-k8s/releases/tag/v5.11.4013)
+
+### Features
+
+#### Security
+
+- Sign release images `(PR #2703)`
+  - Publish signatures for release containers.  Backport c11764be4adb377521e4067c4852953d7c434e24 from #2697
+
+#### Others
+
+- Allow single container server to run postgresql-16 `(PR #2714)`
+  - server: runs postgresql from /var/run/postgresql instead of /run/postgresql
+ Backport 36c78cdf596e1b22079512931fa526346c2ec821 from #2711
+
+### Fix
+
+#### Release
+
+- recover from unclean database shutdowns in pgsql entrypoint `(PR #2706)`
+  - fix(rel): fix issue with Postgres docker container failing upgrades after an unclean database shutdown.
+  Backport ca5185ce2528b67e1ce6bcb5170f96d3699e11e0 from #2660
+
+### Reverts
+
+  There were no reverts for this release
+
+### Uncategorized
+
+#### Others
+
+- [Backport 5.11.x] fix(Bitbucket Cloud): Fix pagination logic for bitbucket cloud permissions `(PR #2700)`
+  - Fixed an issue where Bitbucket Cloud permission syncs could produce incomplete results, resulting in lacking permissions.  Backport 389661481f0f0a2385ef4f78f4113ab6ba14f4d5 from #2699
+
+{/* RSS={"version":"v5.11.4013", "releasedAt": "2025-01-11"} */}
+
+
+# 5.11 Patch 2
+
+## v5.11.3601
+
+- [sourcegraph](https://github.com/sourcegraph/sourcegraph/releases/tag/v5.11.3601)
+
+- [docker-compose](https://github.com/sourcegraph/deploy-sourcegraph-docker/releases/tag/v5.11.3601)
+
+- [helm](https://github.com/sourcegraph/deploy-sourcegraph-helm/releases/tag/v5.11.3601)
+
+- [kustomize](https://github.com/sourcegraph/deploy-sourcegraph-k8s/releases/tag/v5.11.3601)
+
+### Features
+
+#### Code Intelligence
+
+- Make syntactic indexing write partial index to disk already GZIP compressed `(PR #2646)`
+
+### Reverts
+
+  There were no reverts for this release
+
+{/* RSS={"version":"v5.11.3601", "releasedAt": "2025-01-08"} */}
+
+
+# 5.11 Patch 1
+
+## v5.11.2732
+
+- [sourcegraph](https://github.com/sourcegraph/sourcegraph/releases/tag/v5.11.2732)
+
+- [docker-compose](https://github.com/sourcegraph/deploy-sourcegraph-docker/releases/tag/v5.11.2732)
+
+- [helm](https://github.com/sourcegraph/deploy-sourcegraph-helm/releases/tag/v5.11.2732)
+
+- [kustomize](https://github.com/sourcegraph/deploy-sourcegraph-k8s/releases/tag/v5.11.2732)
+
+### Fix
+
+#### Search
+
+- propagate disk space to NewFirecrackerWorkspace `(PR #2574)`
+  - Addresses errors similar to: `failed to prepare workspace: failed to create ext4 filesystem in backing file: "mke2fs 1.45.5 (07-Jan-2020)\nThe file losetup: /var/lib/firecracker/loop-devices/workspace-loop-47749-3763347387: Warning: file is smaller than 512 bytes; the loop device may be useless or invisible for system tools.\n/dev/loop13 does not exist and no size was specified.\n": exit status 1`
+  - Affects reading and using the environment variable `EXECUTOR_FIRECRACKER_DISK_SPACE`  Backport 22db2a97a0393cdd233a92da7ade96cd59bb99ef from #2562
+
+### Chore
+
+#### Security
+
+- Auto-update all packages in Sourcegraph base images (5.11.x) `(PR #2494)`
+
+### Reverts
+
+  There were no reverts for this release
+
+{/* RSS={"version":"v5.11.2732", "releasedAt": "2025-01-03"} */}
+
+
 # 5.11 Patch 0
 
 > Warning: This release updates the database container images from Postgres 12 to Postgres 16, and begins using Wolfi based images. Customers are advised to have a database backup before upgrading! See our [postgres 12 end of life](https://sourcegraph.com/docs/admin/postgres12_end_of_life_notice#postgres-12-end-of-life) notice!

src/components/PreCodeBlock.tsx

@@ -72,8 +72,15 @@ export async function PreCodeBlock({ children, ...props }: PreProps) {
 
   const version = await getLatestVersion()
   const version_no_v = trimPrefix(version, "v")
+  let mustReplaceVersions = false
+  if (codeContent.includes("{CURRENT_VERSION}") || codeContent.includes("{CURRENT_VERSION_NO_V}")) {
+    mustReplaceVersions = true
+  }
   codeContent = codeContent.replace(/{CURRENT_VERSION}/g, version)
   codeContent = codeContent.replace(/{CURRENT_VERSION_NO_V}/g, version_no_v)
+  if (mustReplaceVersions) {
+    children = codeContent
+  }
 
   return (
     <div className="relative">