Skip to content

Promote Beta and update all dependencies for 7.0 release#11022

Merged
mansona merged 20 commits into
releasefrom
release-plan-7-0
May 15, 2026
Merged

Promote Beta and update all dependencies for 7.0 release#11022
mansona merged 20 commits into
releasefrom
release-plan-7-0

Conversation

@mansona

@mansona mansona commented May 15, 2026

Copy link
Copy Markdown
Member

I had to commit some extra things to this PR to get it passing, I don't know why but the style of asserting on a promise was not working any more so I had to update a test 🤔

mansona and others added 17 commits April 20, 2026 14:06
# 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.
# 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 changed the base branch from master to release May 15, 2026 11:43
@mansona mansona closed this May 15, 2026
@mansona mansona reopened this May 15, 2026
@mansona mansona force-pushed the release-plan-7-0 branch from fc46ab3 to c393b31 Compare May 15, 2026 13:21
@mansona mansona requested a review from a team May 15, 2026 13:33
@mansona mansona merged commit 5839b1d into release May 15, 2026
70 checks passed
@mansona mansona deleted the release-plan-7-0 branch May 15, 2026 16:46
@mansona mansona mentioned this pull request May 15, 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.

2 participants