Merge branch 'release/3.6.3' into main

.travis.yml

@@ -27,7 +27,7 @@ jobs:
     env: DB=mysql
   - php: 7.3
     env: DB=pgsql
-  - php: 7.2
+  - php: 7.2.5
     env: DB=mysql
   - php: 7.2.5
     env: DB=pgsql

CHANGELOG.md

@@ -1,5 +1,28 @@
 # Release Notes for Craft CMS 3.x
 
+## 3.6.3 - 2021-02-03
+
+### Added
+- Added `craft\base\ElementInterface::setUiLabel()`.
+- Added `craft\fields\BaseRelationField::tableAttributeHtml()`.
+- Added `craft\helpers\Cp::elementPreviewHtml()`.
+
+### Changed
+- Entry indexes now include draft entries in the main entry listings. ([#7401](https://github.com/craftcms/cms/issues/7401))
+- Entry indexes can now show a “Drafts” column, which lists the entries’ drafts. ([#7473](https://github.com/craftcms/cms/issues/7473))
+- The “Publish draft” button on Edit Entry pages can now be activated using a <kbd>Ctrl</kbd>/<kbd>Command</kbd> + <kbd>Alt</kbd>/<kbd>Option</kbd> + <kbd>S</kbd> keyboard shortcut.
+- Entry queries’ `drafts` param can now be set to `null`, indicating that both normal entries _and_ drafts can be included in the results.
+- Entries can now be eager-loaded with `drafts`.
+- `craft\helpers\Cp::elementHtml` now has a `$showDraftBadge` argument.
+
+### Removed
+- Removed `craft\fields\BaseRelationField::elementPreviewHtml()`.
+
+### Fixed
+- Fixed a bug where Edit Entry pages would get a “Create a new entry” heading when editing an existing draft entry.
+- Fixed a bug where user impersonation URLs only worked for active users. ([#7475](https://github.com/craftcms/cms/issues/7475))
+- Fixed a bug where `craft\elements\db\ElementQuery::draftOf()` didn’t accept passing in `'*'`. ([#7470](https://github.com/craftcms/cms/issues/7470))
+
 ## 3.6.2 - 2021-01-29
 
 ### Added

composer.json

@@ -1,7 +1,7 @@
 {
   "name": "craftcms/cms",
   "description": "Craft CMS",
-  "version": "3.6.2",
+  "version": "3.6.3",
   "keywords": [
     "cms",
     "craftcms",

package.json

@@ -3,6 +3,8 @@
   "main": "gulpfile.js",
   "scripts": {
     "gulp:cp": "gulp cp",
+    "gulp:cp-sass": "gulp cp-sass",
+    "gulp:cp-js": "gulp cp-js",
     "gulp:deps": "gulp deps"
   },
   "devDependencies": {
@@ -19,7 +21,7 @@
     "element-resize-detector": "^1.2.1",
     "event-stream": "3.3.4",
     "fabric": "^1.7.19",
-    "garnishjs": "^0.1.37",
+    "garnishjs": "^0.1.39",
     "graphiql": "^0.14.2",
     "graphiql-explorer": "^0.6.2",
     "graphql": "^14.6.0",