Merge remote-tracking branch 'origin/trunk' into update/videopress-up…

…date-thumb-placeholder-while-updating
Automattic · Oct 7, 2024 · 9b4eb75 · 9b4eb75
2 parents 794d324 + ce31d5d
commit 9b4eb75
Show file tree

Hide file tree

Showing 96 changed files with 967 additions and 796 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml
@@ -1,6 +1,7 @@
 name: Bug Report
 description: Report issues with one of our products.
 labels: [ 'Needs triage', '[Type] Bug' ]
+type: 'Bug'
 body:
   - type: markdown
     attributes:

diff --git a/.github/ISSUE_TEMPLATE/enhancement.yml b/.github/ISSUE_TEMPLATE/enhancement.yml
@@ -2,6 +2,7 @@ name: Enhancement Request
 description: Suggest a change to a feature you like!
 title: "Enhancement:"
 labels: ["[Type] Enhancement"]
+type: 'Enhancement'
 body:
   - type: dropdown
     id: plugin-type

diff --git a/.github/ISSUE_TEMPLATE/feature-request.yml b/.github/ISSUE_TEMPLATE/feature-request.yml
@@ -2,6 +2,7 @@ name: Feature Request
 description: Suggest an idea for this project!
 title: "Feature Request:"
 labels: ["[Type] Feature Request"]
+type: 'Enhancement'
 body:
   - type: dropdown
     id: plugin-type

diff --git a/.github/files/e2e-tests/notification-rules.enc b/.github/files/e2e-tests/notification-rules.enc
diff --git a/.phan/stubs/amp-stubs.php b/.phan/stubs/amp-stubs.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Stubs automatically generated from AMP 2.5.4 and AMP for WP 1.0.98
+ * Stubs automatically generated from AMP 2.5.4 and AMP for WP 1.0.99.1
  * using the definition file `tools/stubs/amp-stub-defs.php` in the Jetpack monorepo.
  *
  * Do not edit this directly! Run tools/stubs/update-stubs.sh to regenerate it.

diff --git a/.phan/stubs/woocommerce-internal-stubs.php b/.phan/stubs/woocommerce-internal-stubs.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Stubs automatically generated from WooCommerce 9.3.2
+ * Stubs automatically generated from WooCommerce 9.5.0-dev
  * using the definition file `tools/stubs/woocommerce-internal-stub-defs.php` in the Jetpack monorepo.
  *
  * Do not edit this directly! Run tools/stubs/update-stubs.sh to regenerate it.

diff --git a/.phan/stubs/woocommerce-payments-stubs.php b/.phan/stubs/woocommerce-payments-stubs.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Stubs automatically generated from WooPayments 8.2.1
+ * Stubs automatically generated from WooPayments 8.2.2
  * using the definition file `tools/stubs/woocommerce-payments-stub-defs.php` in the Jetpack monorepo.
  *
  * Do not edit this directly! Run tools/stubs/update-stubs.sh to regenerate it.