Skip to content

Patch back fixes from 7.1.0-alpha.2 (WIP) to main to fix CI#22016

Merged
shilman merged 8 commits into
mainfrom
main-prerelease
Apr 10, 2023
Merged

Patch back fixes from 7.1.0-alpha.2 (WIP) to main to fix CI#22016
shilman merged 8 commits into
mainfrom
main-prerelease

Conversation

@shilman
Copy link
Copy Markdown
Member

@shilman shilman commented Apr 10, 2023 •
edited
Loading

Self-merging to fix CI

ndelangen and others added 8 commits April 8, 2023 11:29
@ndelangen @shilman
Merge pull request #21913 from storybookjs/norebrt/remove-pnp-template
0e3b611 
Build: remove pnp sandbox template
@shilman
Merge branch 'main' into main-prerelease
57a0a14
@jonniebigodes @shilman
Merge pull request #21973 from storybookjs/chore_docs_update_install_…
7c09ef3 
…instructions

Chore: (Docs) Standardize install instructions in documentation
@jonniebigodes @shilman
Merge pull request #21976 from storybookjs/chore_issue_template_tweak
9c8db7d 
Chore (Documentation) Fix issue template to feature correct command
@jonniebigodes @shilman
Merge pull request #21985 from storybookjs/benmccann-patch-1
557374a 
docs: fix broken link in readme
@shilman
Merge pull request #22013 from storybookjs/shilman/fix-vite-react-docgen
57eb8a6 
React-vite: Fix perf regression by pinning vite-plugin-react-docgen-ts
@shilman
Merge pull request #22006 from storybookjs/shilman/21982-fix-packagem…
897aa52 
…gr-typo

CLI: Fix JsPackageManager typo
@jonniebigodes @shilman
Merge pull request #19400 from sriram-km/sri-ram-contribution
4d70f84 
Improved README.md
@shilman shilman added the maintenance User-facing maintenance tasks label Apr 10, 2023
@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Apr 10, 2023


Fails
🚫 A 'patch' label is required to merge during stabilization.

Patch PRs are small bug fixes, build updates, and documentation changes.
They do not include new features or more disruptive bugfixes.

These changes will be first released on 7.1-alpha, then patched back to 'main'
after they have been verified to be correct and released as 7.0.x patch releases.

After the stabilization period ends (ETA 2023-04-12), the 'patch' label
will no longer be required to merge into next, and we will merge ALL accepted
PRs to 'next' and release them on 7.1-alpha. Patch PRs will be
patched back to 'main' and released in 7.0.x patch releases.

Generated by 🚫 dangerJS against 4d70f84

@shilman shilman merged commit e0ca5fd into main Apr 10, 2023
@shilman shilman deleted the main-prerelease branch April 10, 2023 16:57
@shilman shilman mentioned this pull request Apr 11, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

maintenance User-facing maintenance tasks

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@shilman @ndelangen @jonniebigodes