Skip to content

Prepare 7.1 Alpha#11001

Merged
mansona merged 15 commits into
masterfrom
merge-beta
Apr 24, 2026
Merged

Prepare 7.1 Alpha#11001
mansona merged 15 commits into
masterfrom
merge-beta

Conversation

@mansona

@mansona mansona commented Apr 23, 2026

Copy link
Copy Markdown
Member

No description provided.

mansona and others added 15 commits April 9, 2026 15:13
# 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.12 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
#	package.json
#	packages/app-blueprint/files/package.json
#	pnpm-lock.yaml
#	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 merged commit 05f8ea1 into master Apr 24, 2026
76 checks passed
@mansona mansona deleted the merge-beta branch April 24, 2026 05:55
@mansona mansona mentioned this pull request Apr 24, 2026
@mansona mansona mentioned this pull request May 22, 2026
@mansona mansona added the ignore label May 22, 2026
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.

1 participant