Skip to content

mermaid: The other half of #57967#58419

Merged
cameron1024 merged 5 commits into
mainfrom
merman-followup-fixes
Jun 3, 2026
Merged

mermaid: The other half of #57967#58419
cameron1024 merged 5 commits into
mainfrom
merman-followup-fixes

Conversation

@cameron1024

Copy link
Copy Markdown
Contributor

I was a silly goose didn't notice my git push failed, so merged #57967 without a critical commit, and some follow-ups.

This PR just cherry-picks those commits.

Release Notes:

  • N/A or Added/Fixed/Improved ...

@cla-bot cla-bot Bot added the cla-signed The user has signed the Contributor License Agreement label Jun 3, 2026
@zed-community-bot zed-community-bot Bot added the staff Pull requests authored by a current member of Zed staff label Jun 3, 2026
@cameron1024

Copy link
Copy Markdown
Contributor Author

Validated that commit 64746451f6408d289f9b50ed0d39a10077e130c0 fixes the stack overflow

@cameron1024 cameron1024 enabled auto-merge June 3, 2026 14:02
@cameron1024 cameron1024 added this pull request to the merge queue Jun 3, 2026
Merged via the queue into main with commit a5f0dc3 Jun 3, 2026
43 checks passed
@cameron1024 cameron1024 deleted the merman-followup-fixes branch June 3, 2026 14:14
@cameron1024

Copy link
Copy Markdown
Contributor Author

/cherry-pick preview

@zed-zippy

zed-zippy Bot commented Jun 3, 2026

Copy link
Copy Markdown
Contributor

🍒💥 Cherry-pick did not succeed
https://github.com/zed-industries/zed/actions/runs/26890720997

@cameron1024 cameron1024 mentioned this pull request Jun 3, 2026
5 tasks
smitbarmase pushed a commit that referenced this pull request Jun 3, 2026
Cherry-picks 2 PRs - originally meant to be 1 PR, but my local git state
was messed up, causing a `git push` to fail and I didn't notice:
- #57967
- #58419

Self-Review Checklist:

- [ ] I've reviewed my own diff for quality, security, and reliability
- [ ] Unsafe blocks (if any) have justifying comments
- [ ] The content is consistent with the [UI/UX
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
- [ ] Tests cover the new/changed behavior
- [ ] Performance impact has been considered and is acceptable

Closes #ISSUE

Release Notes:

- N/A or Added/Fixed/Improved ...

---------

Co-authored-by: Latias94 <superfrankie621@gmail.com>
TomPlanche pushed a commit to TomPlanche/zed that referenced this pull request Jun 8, 2026
I was a silly goose didn't notice my `git push` failed, so merged zed-industries#57967
without a critical commit, and some follow-ups.

This PR just cherry-picks those commits.

Release Notes:

- N/A or Added/Fixed/Improved ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

cla-signed The user has signed the Contributor License Agreement staff Pull requests authored by a current member of Zed staff

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants