Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace zed with zed2 #3862

Merged
merged 31 commits into from
Jan 3, 2024
Merged

Replace zed with zed2 #3862

merged 31 commits into from
Jan 3, 2024

Conversation

maxbrunsfeld
Copy link
Collaborator

No description provided.

maxbrunsfeld and others added 11 commits January 3, 2024 10:14
Co-authored-by: Mikayla <mikayla@zed.dev>
Co-authored-by: Mikayla <mikayla@zed.dev>
…mand_palette, file_finder

Co-authored-by: Mikayla <mikayla@zed.dev>
…, copilot_button, breadcrumbs, activity_indicator

Co-authored-by: Mikayla <mikayla@zed.dev>
Co-authored-by: Mikayla <mikayla@zed.dev>
Co-authored-by: Mikayla <mikayla@zed.dev>
Co-authored-by: Mikayla <mikayla@zed.dev>
Co-authored-by: Mikayla <mikayla@zed.dev>
Co-authored-by: Mikayla <mikayla@zed.dev>
maxbrunsfeld and others added 4 commits January 3, 2024 11:48
Co-authored-by: Mikayla <mikayla@zed.dev>
Co-authored-by: Mikayla <mikayla@zed.dev>
Co-authored-by: Mikayla <mikayla@zed.dev>
maxdeviant added a commit that referenced this pull request Jan 3, 2024
This PR decouples the `theme_importer` from the `theme` and `gpui`
crates.

We achieve this by inlining all of the relevant bits needed to
deserialize Zed1 themes.

This will allow us to continue to import Zed1 themes after we land
#3862.

Release Notes:

- N/A
maxdeviant and others added 13 commits January 3, 2024 15:03
This PR decouples the `theme_importer` from the `theme` and `gpui`
crates.

We achieve this by inlining all of the relevant bits needed to
deserialize Zed1 themes.

This will allow us to continue to import Zed1 themes after we land
#3862.

Release Notes:

- N/A
Co-authored-by: Mikayla <mikayla@zed.dev>
Co-authored-by: Mikayla <mikayla@zed.dev>
Co-authored-by: Mikayla <mikayla@zed.dev>
Co-authored-by: Mikayla <mikayla@zed.dev>
Co-authored-by: Mikayla <mikayla@zed.dev>
Co-authored-by: Mikayla <mikayla@zed.dev>
Co-authored-by: Mikayla <mikayla@zed.dev>
@maxbrunsfeld maxbrunsfeld merged commit b2efec9 into main Jan 3, 2024
@maxbrunsfeld maxbrunsfeld deleted the cut-to-zed-2 branch January 3, 2024 21:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants