Merge branch '4.x' into 4.9

# Conflicts: # .github/workflows/ci.yml # src/web/assets/cp/dist/cp.js # src/web/assets/cp/dist/cp.js.map
craftcms · Mar 30, 2024 · db53003 · db53003
2 parents 78eeada + 5572bb7
commit db53003
Show file tree

Hide file tree

Showing 38 changed files with 1,030 additions and 1,014 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -3,7 +3,7 @@ on:
   workflow_dispatch:
   push:
     branches:
-      - develop
+      - 4.x
       - '4.9'
   pull_request:
 permissions:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,14 @@
 # Release Notes for Craft CMS 4
 
+## Unreleased
+
+- The Craft 5 Upgrade utility now shows the upgrade status and latest compatible version for abandoned plugins.
+- Fixed a “Double-instantiating a checkbox select on an element” JavaScript warning. ([#14707](https://github.com/craftcms/cms/issues/14707))
+
+## 4.8.6 - 2024-03-26
+
+- Added the “Craft 5 Upgrade” utility.
+
 ## 4.8.5 - 2024-03-22
 
 - Selectize inputs no longer automatically select the hovered option on <kbd>Tab</kbd> press. ([selectize/selectize.js#2085](https://github.com/selectize/selectize.js/issues/2085))
@@ -8,7 +17,7 @@
 - Fixed a bug where filesystems’ `afterSave()` and `afterDelete()` methods weren’t getting called. ([#14634](https://github.com/craftcms/cms/pull/14634))
 - Fixed an error that could occur on `elements/recent-activity` Ajax requests when editing an element. ([#14635](https://github.com/craftcms/cms/issues/14635))
 
-## 4.8.4 - 2024-03-19
+## 4.8.4 - 2024-03-19 0473839613b9f75edd0796ff27f7a322da4f6d49
 
 - Craft no longer shows an alert when an installed Craft/plugin edition is a lower tier than the licensed edition.
 

diff --git a/src/config/app.php b/src/config/app.php
@@ -3,7 +3,7 @@
 return [
     'id' => 'CraftCMS',
     'name' => 'Craft CMS',
-    'version' => '4.8.5',
+    'version' => '4.8.6',
     'schemaVersion' => '4.5.3.0',
     'minVersionRequired' => '3.7.11',
     'basePath' => dirname(__DIR__), // Defines the @app alias

diff --git a/src/services/Utilities.php b/src/services/Utilities.php
@@ -23,6 +23,7 @@
 use craft\utilities\SystemMessages as SystemMessagesUtility;
 use craft\utilities\SystemReport;
 use craft\utilities\Updates as UpdatesUtility;
+use craft\utilities\Upgrade;
 use yii\base\Component;
 
 /**
@@ -66,6 +67,7 @@ class Utilities extends Component
     public function getAllUtilityTypes(): array
     {
         $utilityTypes = [
+            Upgrade::class,
             UpdatesUtility::class,
             SystemReport::class,
             ProjectConfigUtility::class,

diff --git a/src/translations/ar/app.php b/src/translations/ar/app.php
diff --git a/src/translations/cs/app.php b/src/translations/cs/app.php
diff --git a/src/translations/da/app.php b/src/translations/da/app.php
diff --git a/src/translations/de-CH/app.php b/src/translations/de-CH/app.php