Merge remote-tracking branch 'origin/release' into beta

mansona · mansona · commit 4e51981e3cd2 · 2025-10-13T22:32:07.000+01:00
# Conflicts:
#	.release-plan.json
#	CHANGELOG.md
#	package.json
#	packages/addon-blueprint/package.json
#	packages/app-blueprint/files/package.json
#	packages/app-blueprint/package.json
#	tests/acceptance/new-test.js
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -8,7 +8,6 @@ on:
       - release
       - next
       - 'v*'
-      - 'release-*'
       - 'lts-*'
   pull_request:
   workflow_dispatch:
diff --git a/packages/addon-blueprint/package.json b/packages/addon-blueprint/package.json
@@ -6,6 +6,7 @@
     "url": "https://github.com/ember-cli/ember-cli.git",
     "directory": "packages/addon-blueprint"
   },
+  "license": "MIT",
   "keywords": [
     "ember-blueprint"
   ],
diff --git a/packages/app-blueprint/package.json b/packages/app-blueprint/package.json
@@ -6,6 +6,7 @@
     "url": "https://github.com/ember-cli/ember-cli.git",
     "directory": "packages/app-blueprint"
   },
+  "license": "MIT",
   "keywords": [
     "ember-blueprint"
   ],
diff --git a/packages/blueprint-blueprint/package.json b/packages/blueprint-blueprint/package.json
@@ -6,6 +6,7 @@
     "url": "https://github.com/ember-cli/ember-cli.git",
     "directory": "packages/blueprint-blueprint"
   },
+  "license": "MIT",
   "keywords": [
     "ember-blueprint"
   ]
diff --git a/packages/blueprint-model/package.json b/packages/blueprint-model/package.json
@@ -6,6 +6,7 @@
     "url": "https://github.com/ember-cli/ember-cli.git",
     "directory": "packages/blueprint-model"
   },
+  "license": "MIT",
   "dependencies": {
     "chalk": "^4.1.2",
     "diff": "^7.0.0",

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`	`"url": "https://github.com/ember-cli/ember-cli.git",`
`7`	`7`	`"directory": "packages/blueprint-blueprint"`
`8`	`8`	`},`
	`9`	`+ "license": "MIT",`
`9`	`10`	`"keywords": [`
`10`	`11`	`"ember-blueprint"`
`11`	`12`	`]`