yenru0/zed
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
39,304 Commits 5 Branches 0 Tags
b6ebe0ff35cf3beaecaae2a89ec15b2c4e26a182
Commit Graph
226 Commits
Author SHA1 Message Date
Marshall Bowers 0821d6fb73 collab: Remove GET /extensions endpoint (#48827) 
This PR removes the `GET /extensions` endpoint from Collab, as it has
been moved to Cloud.

In #48717 we changed it to just proxy to Cloud, but we didn't end up
needing that.

Release Notes:

- N/A
 2026-02-09 23:06:11 +00:00
Marshall Bowers aa11edf99d collab: Proxy GET /extensions to Cloud (#48717) 
This PR updates the `GET /extensions` endpoint in Collab to proxy to
Cloud.

Release Notes:

- N/A
 2026-02-08 05:05:34 +00:00
Marshall Bowers 5ed13a0293 Move extension API DTOs into cloud_api_types (#48689) 
This PR moves the DTOs for the extension API from the `rpc` crate into
the `cloud_api_types` crate.

Release Notes:

- N/A
 2026-02-07 17:54:29 +00:00
Marshall Bowers 2dfb13c4e5 collab: Remove /contributors endpoints (#46418) 
This PR removes the `GET /contributors` and `POST /contributors`
endpoints.

The former was not in use anywhere, and the latter has been moved to
Cloud.

Part of CLO-33.

Release Notes:

- N/A
 2026-01-08 23:46:23 -05:00
Marshall Bowers 32af786a70 collab: Remove GET /contributor endpoint (#46415) 
This PR removes the `GET /contributor` endpoint from Collab, as it has
been moved to Cloud.

Release Notes:

- N/A
 2026-01-09 02:39:19 +00:00
Finn Evers dc72e1c4ba collab: Fix capitalization of copilot name alias (#45497) 
This fixes copilot currently not passing the CLA check. 

Release Notes:

- N/A
 2025-12-21 21:36:54 +00:00
Finn Evers 81519ae923 collab: Add copilot name alias to the GET /contributor endpoint (#44958) 
Although the copilot bot integration is referred to by
`copilot-swe-agent[bot]`
(https://api.github.com/users/copilot-swe-agent[bot]), GitHub parses the
copilot identity as @\copilot in some cases, e.g.
https://github.com/zed-industries/zed/pull/44915#issuecomment-3657567754.
This causes the CLA check to still fail despite Copilot being added to
the CLA endpoint (and https://api.github.com/users/copilot returning a
404 for that very name..).

This PR fixes this by also considering the name alias of Copilot for the
`contributor` endpoint.

Release Notes:

- N/A
 2025-12-16 15:44:30 +01:00
Finn Evers b8d0da97fa collab: Add copilot-swe-agent[bot] to the GET /contributor endpoint (#44934) 
This PR adds the `copilot-swe-agent[bot]` user to the `GET /contributor`
endpoint so that it passes the CLA check.

Release Notes:

- N/A
 2025-12-15 23:46:09 +00:00
Finn Evers c7a1852e36 collab: Add dependabot[bot] to the GET /contributor endpoint (#44919) 
This PR adds the `dependabot[bot]` user to the `GET /contributor`
endpoint so that it passes the CLA check.

Release Notes:

- N/A
 2025-12-15 22:14:04 +01:00
Marshall Bowers 57e1bb8106 collab: Add zed-zippy[bot] to the GET /contributor endpoint (#43568) 
This PR adds the `zed-zippy[bot]` user to the `GET /contributor`
endpoint so that it passes the CLA check.

Release Notes:

- N/A
 2025-11-26 16:53:05 +00:00
Piotr OsiewiczandConrad Irwin 2d55c088cc releases: Add build number to Nightly builds (#42990) 
- **Remove semantic_version crate and use semver instead**
- **Update upload-nightly**


Release Notes:

- N/A

---------

Co-authored-by: Conrad Irwin <conrad.irwin@gmail.com>
 2025-11-24 13:34:04 +01:00
Conrad Irwin 1659fb81e7 Remove panic/crash reporting from collab (#39249) 
Crashes have been going to Sentry since v0.201.x

Release Notes:

- N/A
 2025-09-30 23:10:13 -06:00
tidely 7bdc99abc1 Fix clippy::redundant_clone lint violations (#36558) 
This removes around 900 unnecessary clones, ranging from cloning a few
ints all the way to large data structures and images.

A lot of these were fixed using `cargo clippy --fix --workspace
--all-targets`, however it often breaks other lints and needs to be run
again. This was then followed up with some manual fixing.

I understand this is a large diff, but all the changes are pretty
trivial. Rust is doing some heavy lifting here for us. Once I get it up
to speed with main, I'd appreciate this getting merged rather sooner
than later.

Release Notes:

- N/A
 2025-08-20 12:20:13 +02:00
Piotr Osiewicz 8f567383e4 Auto-fix clippy::collapsible_if violations (#36428) 
Release Notes:

- N/A
 2025-08-19 13:27:24 +00:00
Marshall Bowers 239e479aed collab: Remove Stripe code (#36275) 
This PR removes the code for integrating with Stripe from Collab.

All of these concerns are now handled by Cloud.

Release Notes:

- N/A
 2025-08-15 20:49:56 +00:00
Joseph T. Lyons 75f85b3aaa Remove old telemetry events and transformation layer (#36263) 
Successor to: https://github.com/zed-industries/zed/pull/25179

Release Notes:

- N/A
 2025-08-15 15:37:52 -04:00
Marshall Bowers 740597492b collab: Remove Stripe events polling (#35736) 
This PR removes the Stripe event polling from Collab, as it has been
moved to Cloud.

Release Notes:

- N/A
 2025-08-06 16:53:43 +00:00
Marshall Bowers f27dc7dec7 collab: Remove usage meters sync (#35674) 
This PR removes the usage meters sync from Collab, as it has been moved
to Cloud.

Release Notes:

- N/A
 2025-08-05 22:07:18 +00:00
Michael Sloan 65018c28c0 Rename remaining mentions of "inline completion" to "edit prediction" (#35512) 
Release Notes:

- N/A
 2025-08-04 16:22:18 +00:00
Marshall Bowers 7be1f2418d Replace zed_llm_client with cloud_llm_client (#35309) 
This PR replaces the usage of the `zed_llm_client` with the
`cloud_llm_client`.

It was ported into this repo in #35307.

Release Notes:

- N/A
 2025-07-30 00:09:14 +00:00
Marshall Bowers f0927faf61 collab: Add kill switches for syncing data to and from Stripe (#35304) 
This PR adds two kill switches for syncing data to and from Stripe using
Collab.

The `cloud-stripe-events-polling` and `cloud-stripe-usage-meters-sync`
feature flags control whether we use Cloud for polling Stripe events and
updating Stripe meters, respectively.

When we're ready to hand off the syncing to Cloud we can enable the
feature flag to do so.

Release Notes:

- N/A
 2025-07-29 22:45:00 +00:00
Marshall Bowers d2d116cb02 collab: Remove GET /user endpoint (#35301) 
This PR removes the `GET /user` endpoint, as it has been moved to
`cloud.zed.dev`.

Release Notes:

- N/A
 2025-07-29 22:34:04 +00:00
Marshall Bowers ab90ed41da collab: Remove POST /billing/subscriptions/sync endpoint (#35232) 
This PR removes the `POST /billing/subscriptions/sync` endpoint, as it
has been moved to `cloud.zed.dev`.

Release Notes:

- N/A
 2025-07-28 20:22:54 +00:00
Marshall Bowers 3d4266bb8f collab: Remove POST /billing/subscriptions/manage endpoint (#34986) 
This PR removes the `POST /billing/subscriptions/manage` endpoint, as it
has been moved to `cloud.zed.dev`.

Release Notes:

- N/A
 2025-07-23 23:30:00 +00:00
Marshall Bowers 14171e0721 collab: Add POST /users/:id/update_plan endpoint (#34953) 
This PR adds a new `POST /users/:id/update_plan` endpoint to Collab to
allow Cloud to push down plan updates to users.

Release Notes:

- N/A
 2025-07-23 14:30:08 +00:00
Marshall Bowers 056003860a collab: Remove POST /billing/subscriptions endpoint (#34928) 
This PR removes the `POST /billing/subscriptions` endpoint, as it has
been moved to `cloud.zed.dev`.

Release Notes:

- N/A
 2025-07-22 18:57:07 -04:00
Marshall Bowers 97af7e1bd9 collab: Remove PUT /billing/preferences endpoint (#34825) 
This PR removes the `PUT /billing/preferences` endpoint, as it has been
moved to `cloud.zed.dev`.

Release Notes:

- N/A
 2025-07-21 15:29:16 +00:00
Cole Miller 237ce5c8e8 Report build SHA to Slack for Zed Nightly panics (#34665) 
There can be a bunch of nightlies with the same version number and it's
helpful to know exactly which one reported a panic.

Release Notes:

- N/A
 2025-07-17 21:38:45 +00:00
Marshall Bowers 1e60ebb2c6 collab: Remove GET /billing/usage endpoint (#34651) 
This PR removes the `GET /billing/usage` endpoint, as it has been moved
to `cloud.zed.dev`.

Release Notes:

- N/A
 2025-07-17 18:34:04 +00:00
Marshall Bowers f43bcc1492 collab: Remove GET /billing/subscriptions endpoint (#34580) 
This PR removes the `GET /billing/subscriptions` endpoint, as it has
been moved to `cloud.zed.dev`.

Release Notes:

- N/A
 2025-07-16 22:04:53 +00:00
Marshall Bowers 048dc47d87 collab: Remove GET /billing/preferences endpoint (#34566) 
This PR removes the `GET /billing/preferences` endpoint, as it has been
moved to `cloud.zed.dev`.

Release Notes:

- N/A
 2025-07-16 17:55:01 +00:00
Marshall Bowers a65c0b2bff collab: Fix typo in log message (#34455) 
This PR fixes a small typo in a log message.

Release Notes:

- N/A
 2025-07-15 13:16:49 +00:00
Marshall Bowers 848a86a385 collab: Sync model overages for all active Zed Pro subscriptions (#34452) 
Release Notes:

- N/A
 2025-07-15 13:01:01 +00:00
Marshall Bowers 8d894dd1df collab: Add logs to Stripe usage sync job (#33731) 
This PR adds some additional logs to the Stripe usage sync job for
monitoring purposes.

Release Notes:

- N/A
 2025-07-01 18:10:00 +00:00
Michael Sloan dfa7ed55be collab: Update Stripe customer email before checkout (#32669) 
Release Notes:

- N/A
 2025-06-16 19:55:27 -06:00
Marshall Bowers 9c2b90fb8f collab: Return subscription period from GET /billing/subscriptions (#31987) 
This PR updates the `GET /billing/subscriptions` endpoint to return the
subscription period on them.

Release Notes:

- N/A
 2025-06-03 15:29:08 +00:00
Marshall Bowers 2551bde1d3 collab: Increase number of returned extensions to 1,000 (#31983) 
This PR increases the number of returned extensions from the extension
API to 1,000 (up from 500).

We'll need a better solution at some point, but for now we can keep
bumping this number.

Closes https://github.com/zed-industries/zed/issues/31067.

Release Notes:

- N/A
 2025-06-03 15:03:32 +00:00
Marshall Bowers c1427ea802 collab: Remove POST /billing/subscriptions/migrate endpoint (#31770) 
This PR removes the `POST /billing/subscriptions/migrate` endpoint, as
it is no longer needed.

Release Notes:

- N/A
 2025-05-30 17:16:20 +00:00
Marshall Bowers f9f4be1fc4 collab: Use StripeClient in POST /billing/subscriptions/sync endpoint (#31764) 
This PR updates the `POST /billing/subscriptions/sync` endpoint to use
the `StripeClient` trait instead of using `stripe::Client` directly.

Release Notes:

- N/A
 2025-05-30 16:37:12 +00:00
Marshall BowersandBen Brandt f725b5e248 collab: Use StripeClient in sync_subscription (#31761) 
This PR updates the `sync_subscription` function to use the
`StripeClient` trait instead of using `stripe::Client` directly.

Release Notes:

- N/A

---------

Co-authored-by: Ben Brandt <benjamin.j.brandt@gmail.com>
 2025-05-30 16:08:58 +00:00
Marshall Bowers c7047d5f0a collab: Fully move StripeBilling over to using StripeClient (#31722) 
This PR moves over the last method on `StripeBilling` to use the
`StripeClient` trait, allowing us to fully mock out Stripe behaviors for
`StripeBilling` in tests.

Release Notes:

- N/A
 2025-05-29 23:49:14 +00:00
Marshall Bowers eb863f8fd6 collab: Use StripeClient when creating Stripe Checkout sessions (#31644) 
This PR updates the `StripeBilling::checkout_with_zed_pro` and
`StripeBilling::checkout_with_zed_pro_trial` methods to use the
`StripeClient` trait instead of using `stripe::Client` directly.

Release Notes:

- N/A
 2025-05-29 00:57:04 +00:00
Marshall Bowers 53849cf983 collab: Remove Zed Free as an option when initiating a checkout session (#31638) 
This PR removes Zed Free as an option when initiating a checkout
session, as we manage this plan automatically now.

Release Notes:

- N/A
 2025-05-28 23:00:54 +00:00
Marshall Bowers 469824c350 collab: Use StripeClient for creating model usage meter events (#31633) 
This PR updates the `StripeBilling::bill_model_request_usage` method to
use the `StripeClient` trait.

Release Notes:

- N/A
 2025-05-28 22:19:43 +00:00
Marshall Bowers 00bdebc89d collab: Use StripeClient in StripeBilling::subscribe_to_price (#31631) 
This PR updates the `StripeBilling::subscribe_to_price` method to use
the `StripeClient` trait.

Release Notes:

- N/A
 2025-05-28 21:17:11 +00:00
Marshall Bowers 75e69a5ae9 collab: Use StripeClient to retrieve prices and meters from Stripe (#31624) 
This PR updates `StripeBilling` to use the `StripeClient` trait to
retrieve prices and meters from Stripe instead of using the
`stripe::Client` directly.

Release Notes:

- N/A
 2025-05-28 19:51:06 +00:00
Marshall Bowers 361ceee72b collab: Introduce StripeClient trait to abstract over Stripe interactions (#31615) 
This PR introduces a new `StripeClient` trait to abstract over
interacting with the Stripe API.

This will allow us to more easily test our billing code.

This initial cut is small and focuses just on making
`StripeBilling::find_or_create_customer_by_email` testable. I'll follow
up with using the `StripeClient` in more places.

Release Notes:

- N/A
 2025-05-28 18:34:44 +00:00
Marshall Bowers 32848e9c8a collab: Add support for overage billing for Claude Opus 4 (#31544) 
This PR adds support for billing for overages for Claude Opus 4.

Release Notes:

- N/A
 2025-05-27 18:37:57 +00:00
Marshall Bowers 1683e2f144 collab: Prevent canceling the free plan (#31292) 
This PR makes it so the Zed Free plan cannot be canceled.

We were already preventing this on the zed.dev side, but this will make
it more airtight.

Release Notes:

- N/A
 2025-05-23 15:48:21 +00:00
Marshall Bowers 37f49ce304 collab: Add support for overage billing for Claude Sonnet 4 (#31206) 
This PR adds support for billing for overages for Claude Sonnet 4.

Release Notes:

- N/A
 2025-05-22 18:40:06 +00:00