Skip to content

Merge beta into master and start 6.9 alpha#10815

Merged
mansona merged 24 commits intomasterfrom
merge-beta
Sep 17, 2025
Merged

Merge beta into master and start 6.9 alpha#10815
mansona merged 24 commits intomasterfrom
merge-beta

Conversation

@mansona
Copy link
Member

@mansona mansona commented Sep 16, 2025

No description provided.

boris-petrov and others added 23 commits September 2, 2025 08:04
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
Promote Beta and update all dependencies for 6.7 release
fix release-plan for stable release
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
# Conflicts:
#	CHANGELOG.md
#	packages/app-blueprint/files/package.json
#	tests/fixtures/addon/defaults/package.json
#	tests/fixtures/addon/pnpm/package.json
#	tests/fixtures/addon/typescript/package.json
#	tests/fixtures/addon/yarn/package.json
#	tests/fixtures/app/defaults/package.json
#	tests/fixtures/app/embroider-no-ember-data/package.json
#	tests/fixtures/app/embroider-no-welcome/package.json
#	tests/fixtures/app/embroider-pnpm/package.json
#	tests/fixtures/app/embroider-yarn/package.json
#	tests/fixtures/app/embroider/package.json
#	tests/fixtures/app/no-ember-data/package.json
#	tests/fixtures/app/npm/package.json
#	tests/fixtures/app/pnpm/package.json
#	tests/fixtures/app/typescript-embroider-no-ember-data/package.json
#	tests/fixtures/app/typescript-embroider/package.json
#	tests/fixtures/app/typescript-no-ember-data/package.json
#	tests/fixtures/app/typescript/package.json
#	tests/fixtures/app/yarn/package.json
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
@mansona mansona requested a review from a team September 16, 2025 22:13
@mansona mansona merged commit 64c66b6 into master Sep 17, 2025
140 of 142 checks passed
@mansona mansona deleted the merge-beta branch September 17, 2025 10:23
@mansona mansona mentioned this pull request Sep 17, 2025
@mansona mansona mentioned this pull request Oct 15, 2025
@mansona mansona added the ignore label Oct 15, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants