Skip to content

Commit 3b91451

Browse files
authored
Merge branch 'main' into sg-next-apr-2025
2 parents 59866d0 + 3410b6b commit 3b91451

File tree

4 files changed

+34
-17
lines changed

4 files changed

+34
-17
lines changed

docs/admin/deploy/kubernetes/index.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -938,7 +938,7 @@ When all pods have restarted and show as Running, you can browse to your Sourceg
938938
- Check the `Site Admin > Updates` page to determine [upgrade readiness](/admin/updates/#upgrade-readiness).
939939

940940
**Step 2:**
941-
> <Callout type="warning">The Kubernetes Helm deployment type does not support MVU from Sourcegraph `v5.9.45` versions and earlier to Sourcegraph `v6.0.0`. Admins seeking to upgrade to Sourcegraph `v6.0.0` should upgrade to `v5.10.3940` or `v5.11.6271` and then use the standard upgrade procedure to get to `v6.0.0`. This is because migrator v6.0.0 will no longer connect to Postgres 12 databases. For more info see our [PostgreSQL upgrade docs](/admin/postgres#requirements).</Callout>
941+
> <Callout type="warning">The Kubernetes Helm deployment type does not support MVU from Sourcegraph `v5.9.45` versions and earlier to ANY version `v6.0.x` or later. Admins seeking to upgrade to any Sourcegraph version `v6.0.x` or later (including `v6.1.x`, `v6.2.x`, etc.) must first upgrade to `v5.10.3940` or `v5.11.6271` and then use the standard upgrade procedure to get to their target version. This is because migrator in all versions from `v6.0.0` onwards will no longer connect to Postgres 12 databases. For more info see our [PostgreSQL upgrade docs](/admin/postgres#requirements).</Callout>
942942

943943
Scale down `deployments` and `statefulSets` that access the database, _this step prevents services from accessing the database while schema migrations are in process._
944944
The following services must have their replicas scaled to 0:

docs/admin/how-to/upgrade-postgres-12-16-builtin-dbs.mdx

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,28 @@ $ kubectl apply -f deploy-sourcegraph-k8s/base/sourcegraph/pgsql/pgsql.StatefulS
8282

8383
## Helm
8484

85-
To upgrade builtin containers in Helm admins must update their instance to v5.11.6271 via the [helm multi-version upgrade procedure](/admin/deploy/kubernetes#multi-version-upgrade-procedure) or standard upgrade procedure. This is because `helm upgrade` doesn't support just the DBs in a chart.
85+
When using the in-cluster PostgreSQL databases included in the Sourcegraph Helm chart, database upgrades are integrated with the overall application upgrade process and there is no mechanism to upgrade only the PostgreSQL containers independently. Therefore, the PostgreSQL upgrade must be performed as part of a full Sourcegraph version upgrade.
8686

87-
<Callout type="warning"> In Sourcegraph version 6.0.0 Sourcegraph services will no longer be able to connect to a Postgres 12 database. This means at and after Sourcegraph 6.0.0, migrator will not be connect to older versions to execute the `upgrade` command. </Callout>
87+
For production deployments, we recommend using external PostgreSQL databases, which allows for more flexible database management outside the Helm deployment lifecycle.
88+
89+
### Required Upgrade Path
90+
91+
<Callout type="warning">Sourcegraph versions `v6.0.x` and later require PostgreSQL 16 and will not connect to PostgreSQL 12 databases. This means any direct upgrade from versions earlier than `v5.10.3940` to any version `v6.0.x` or later will fail because the migrator in `v6.0.x` and later cannot connect to PostgreSQL 12 to perform the upgrade.</Callout>
92+
93+
To safely upgrade PostgreSQL in Helm deployments:
94+
95+
1. **First upgrade to an intermediate version**:
96+
- Upgrade to either Sourcegraph `v5.10.3940` or `v5.11.6271` using the [helm multi-version upgrade procedure](/admin/deploy/kubernetes#multi-version-upgrade-procedure) or [standard upgrade procedure](/admin/deploy/kubernetes#standard-upgrades)
97+
- These specific versions include the necessary PostgreSQL upgrade scripts to safely migrate from PG12 to PG16
98+
99+
2. **Verify the PostgreSQL upgrade** (optional):
100+
- You can verify the PostgreSQL version has been successfully upgraded by connecting to the database:
101+
```bash
102+
kubectl exec -it pgsql -- psql -U sg -c "SELECT version();"
103+
```
104+
- The output should show PostgreSQL 16.x
105+
106+
3. **Proceed to target version**:
107+
- Once PostgreSQL has been upgraded to version 16, you can safely upgrade to your target version (`v6.0.x` or later) using the standard upgrade procedure
108+
109+
For any issues during the PostgreSQL upgrade process, please contact [email protected].

docs/cody/capabilities/auto-edit.mdx

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<p className="subtitle">Auto-edit suggests code changes by analyzing cursor movements and typing. After you've made at least one character edit in your codebase, it begins proposing contextual modifications based on your cursor position and recent changes.</p>
44

5-
<Callout type="info">Auto-edits is currently in experimental rollout within the VS Code extension. Access is limited to selected Enterprise Starter (Cody Pro) and Enterprise users on Cody Gateway. We will expand availability as we validate the feature's performance.</Callout>
5+
<Callout type="info">Auto-edit is currently supported in the VS Code extension with Sourcegraph v6.0+. It's available in Beta for Pro, Enterprise Starter and Enterprise users on Cody Gateway. Auto-edit requires Fireworks to be enabled as a provider. Enterprise customers without Fireworks enabled can [disable the feature flag](#auto-edit-access-for-enterprise-customers)</Callout>
66

77
## Capabilities of auto-edit
88

@@ -14,25 +14,20 @@
1414

1515
## Enabling auto-edit
1616

17-
Eligible Cody Pro users will gradually be given access to the auto-edit feature. Once you have it, you will receive an in-editor notification.
17+
Auto-edit is enabled by default for Cody Pro Enterprise Starter, and Enterprise users. You can opt out and switch back to **autocomplete** by selecting it from the suggestion mode in the Cody VS Code extension settings.
1818

19-
<video width="100%" loop playsInline controls style={{ width: '100%', height: 'auto' }}>
20-
<source src="https://storage.googleapis.com/sourcegraph-assets/Docs/Media/auto-edit-in-action-2025.mp4" type="video/mp4" />
21-
</video>
19+
Site admins can opt their organization out of the auto-edit feature by disabling it from their config settings.
2220

2321
### Auto-edit access for Enterprise customers
2422

2523
Auto-edit is available for Enterprise customers with [Sourcegraph Cody Gateway](/cody/core-concepts/cody-gateway#sourcegraph-cody-gateway) access. Enabling the feature requires two steps:
2624

2725
1. Site administrators must:
28-
- Enable the feature flag `cody-autoedit-experiment-enabled-flag`
26+
- Ensure the feature flag `cody-autoedit-experiment-enabled-flag` is enabled (enabled by default)
2927
- Add `fireworks::*` as an [allowed provider](https://sourcegraph.com/docs/cody/enterprise/model-configuration#model-filters) (see below)
30-
2. Once enabled, developers will receive a notification in their editor to turn it on
31-
3. If you skip the notification or don't see it, you can manually enable/disable it from the Cody extension settings.
32-
33-
![enable-from-cody-settings](https://storage.googleapis.com/sourcegraph-assets/Docs/enable-auto-edit-from-settings.jpg)
34-
35-
There is a drop-down menu for Cody's suggestions mode. You can choose between the default autocomplete and the auto-edit mode, or you can turn off the suggestions completely.
28+
2. Once enabled, auto-edit will become the default suggestion mode for all users
29+
3. Users can optionally switch back to autocomplete from the Cody extension settings
30+
4. Site admins can opt out of auto-edits using the `cody-autoedit-experiment-enabled-flag` feature flag
3631

3732
The following example demonstrates how to add Fireworks as an allowed LLM provider:
3833

@@ -85,4 +80,4 @@ The auto-edit feature can help you with various repetitive tasks in your code:
8580
- **Call site updates**: When you change a function's signature, auto-edit detects all locations where the function is called and suggests necessary modifications to match the new signature. This includes updating parameter orders, adding error handling, and adjusting return value usage.
8681
- **Test file maintenance**: Helps with repetitive updates in test files, such as modifying test assertions, updating mock objects, or changing test data structures. Auto-edit recognizes patterns from your recent changes and suggests similar modifications across related tests.
8782
- **Parameter refactoring**: Assists in adding, removing, or reorganizing function parameters. When you unpack a function to handle more cases, auto-edit helps restructure the parameter list and suggests corresponding changes at call sites.
88-
- **Type system modifications**: When updating type definitions or interfaces, auto-edit identifies and suggests consistent changes across your codebase. This includes updating variable declarations, function parameters, and return types to maintain type consistency.
83+
- **Type system modifications**: Auto-edit identifies and suggests consistent changes across your codebase when updating type definitions or interfaces. This includes updating variable declarations, function parameters, and return types to maintain type consistency.

docs/pricing/plan-comparison.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
| Integrated search results | - |||
1212
| Prompt Library ||||
1313
| Bring your own LLM Key | - | - | Self-Hosted only |
14-
| Auto-edit | - | Experimental | Experimental |
14+
| Auto-edit | - | Beta | Beta |
1515
| Aentic chat experience | - | Experimental | Experimental |
1616
| **Code Search** | | | |
1717
| Code Search | - |||

0 commit comments

Comments
 (0)