Skip to content

chore(repo): Back-merge master into minor - #5063

Merged
dlhck merged 3 commits into
minorfrom
backmerge-minor
Jul 30, 2026
Merged

chore(repo): Back-merge master into minor#5063
dlhck merged 3 commits into
minorfrom
backmerge-minor

Conversation

@dlhck

@dlhck dlhck commented Jul 30, 2026 •
edited by blacksmith-sh Bot
Loading

Copy link
Copy Markdown
Collaborator

Summary

  • back-merge master into minor
  • resolve the generated docs/manifest.json conflict using the newer regenerated timestamp
  • preserve the dashboard fallback-locale fix from master

Why

The automated back-merge PR #5062 could not be merged because both branches updated the generated docs manifest.

Validation

  • docs/manifest.json parses successfully with jq
  • no merge conflict markers remain
  • origin/minor is an ancestor of the resolved branch
  • focused dashboard test startup was attempted, but this checkout does not have a built @vendure/core package for Vite to resolve

Replaces #5062.

View with [code]smith Autofix with [code]smith
Need help on this PR? Tag @codesmith-bot with what you need. Autofix is disabled.

dlhck and others added 3 commits July 30, 2026 10:08
@dlhck @vendure-ci-automation-bot
fix(dashboard): Activate fallback locale before extensions (#5061)
aaa2eb0 
Co-authored-by: vendure-ci-automation-bot[bot] <221402278+vendure-ci-automation-bot[bot]@users.noreply.github.com>
@vendure-ci-automation-bot
docs: Regenerate manifest.json
abc8000
@dlhck
chore: merge origin/minor
8ed7446
@vendure-developer-hub

vendure-developer-hub Bot commented Jul 30, 2026 •
edited
Loading

Copy link
Copy Markdown

Docs preview — PR merged

@vercel

vercel Bot commented Jul 30, 2026

Copy link
Copy Markdown

The latest updates on your projects. Learn more about Vercel for GitHub.

Project Deployment Actions Updated (UTC)
vendure-storybook Building Building Preview Jul 30, 2026 8:16am

Request Review

@coderabbitai

coderabbitai Bot commented Jul 30, 2026

Copy link
Copy Markdown
Contributor

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Pro Plus

Run ID: 979e58b2-2017-42e1-a859-ac27e232c3e7

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@dlhck dlhck mentioned this pull request Jul 30, 2026
Closed
@dlhck
dlhck merged commit d537d58 into minor Jul 30, 2026
25 of 27 checks passed
@dlhck
dlhck deleted the backmerge-minor branch July 30, 2026 08:18
@vendure-ci-automation-bot vendure-ci-automation-bot Bot locked and limited conversation to collaborators Jul 30, 2026
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@dlhck