Merge branch 'release/21.5' of github.com:Yoast/wordpress-seo into trunk

Yoast · Oct 24, 2023 · dacdf1f · dacdf1f
2 parents 1e8d4d1 + 93b4a9d
commit dacdf1f
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 9 deletions.
diff --git a/css/src/modal.css b/css/src/modal.css
@@ -64,6 +64,7 @@
 
 	@media (min-width: 600px) {
 		border-radius: 8px;
+		max-height: calc( 100% - 48px );
 	}
 }
 
@@ -80,6 +81,10 @@
 	margin: 0;
 }
 
+.yoast-gutenberg-modal .components-modal__content .components-modal__header {
+	border-bottom-color: #e2e8f0 !important;
+}
+
 .yoast-gutenberg-modal .components-modal__icon-container {
 	display: inline-flex;
 }

diff --git a/package.json b/package.json
@@ -83,7 +83,7 @@
     "typescript": "^4.2.4"
   },
   "yoast": {
-    "pluginVersion": "21.5-RC2"
+    "pluginVersion": "21.5-RC3"
   },
   "version": "0.0.0"
 }
diff --git a/packages/js/src/components/UpsellBox.js b/packages/js/src/components/UpsellBox.js
@@ -117,7 +117,6 @@ class UpsellBox extends Component {
 		const price = newPrice ? newPrice : defaultPrice;
 		return (
 			<Fragment>
-				<hr className="yst-mt-1.5 yst-mb-0 yst-border-t-0 yst-border-b-slate-200" />
 				{ isBlackFriday &&
 				<div className="yst-flex yst-justify-between yst-items-center yst-text-lg yst-content-between yst-bg-black yst-text-amber-300 yst-h-9 yst-border-amber-300 yst-border-y yst-border-x-0 yst-border-solid yst-px-6">
 					<div>{ __( "BLACK FRIDAY", "wordpress-seo" ) }</div>

diff --git a/readme.txt b/readme.txt
@@ -4,7 +4,7 @@ Donate link: https://yoa.st/1up
 License: GPLv3
 License URI: http://www.gnu.org/licenses/gpl.html
 Tags: SEO, XML sitemap, Content analysis, Readability, Schema
-Tested up to: 6.3
+Tested up to: 6.4
 Stable tag: 21.4
 Requires PHP: 7.2.5
 
@@ -360,14 +360,15 @@ Release date: 2023-10-31
 
 #### Bugfixes
 
-*  Specifies the correct prop type for props that can contain an interpolated string.
+* Fixes a bug where console warnings about incorrect prop types would be shown on the integrations page.
 
 #### Other
 
 * Adds indexation exclusion for Gutenberg Patterns taxonomy.
 * Improves the FAQ block description by removing any reference to the previous restriction of one block per post.
-* Improves the inline documentation for the `WPSEO_Option` class. Props to @costdev.
+* Improves the inline documentation for the `WPSEO_Option` class. Props to [costdev](https://github.com/costdev).
 * Leverages Script Strategy feature to add the async attribute to the `wordproof` script in case WordPress version is 6.3 or higher. Props to [adamsilverstein](https://github.com/adamsilverstein).
+* Sets the WordPress tested up to version to 6.4.
 
 = 21.4 =
 

diff --git a/tests/unit/bootstrap.php b/tests/unit/bootstrap.php
@@ -36,7 +36,7 @@
 define( 'YOAST_VENDOR_PREFIX_DIRECTORY', 'vendor_prefixed' );
 
 define( 'YOAST_SEO_PHP_REQUIRED', '7.2.5' );
-define( 'YOAST_SEO_WP_TESTED', '6.3.2' );
+define( 'YOAST_SEO_WP_TESTED', '6.4' );
 define( 'YOAST_SEO_WP_REQUIRED', '6.2' );
 
 if ( ! defined( 'WPSEO_NAMESPACES' ) ) {

diff --git a/wp-seo-main.php b/wp-seo-main.php
@@ -15,7 +15,7 @@
  * {@internal Nobody should be able to overrule the real version number as this can cause
  *            serious issues with the options, so no if ( ! defined() ).}}
  */
-define( 'WPSEO_VERSION', '21.5-RC2' );
+define( 'WPSEO_VERSION', '21.5-RC3' );
 
 
 if ( ! defined( 'WPSEO_PATH' ) ) {
@@ -35,7 +35,7 @@
 define( 'YOAST_VENDOR_PREFIX_DIRECTORY', 'vendor_prefixed' );
 
 define( 'YOAST_SEO_PHP_REQUIRED', '7.2.5' );
-define( 'YOAST_SEO_WP_TESTED', '6.3.2' );
+define( 'YOAST_SEO_WP_TESTED', '6.4' );
 define( 'YOAST_SEO_WP_REQUIRED', '6.2' );
 
 if ( ! defined( 'WPSEO_NAMESPACES' ) ) {

diff --git a/wp-seo.php b/wp-seo.php
@@ -8,7 +8,7 @@
  *
  * @wordpress-plugin
  * Plugin Name: Yoast SEO
- * Version:     21.5-RC2
+ * Version:     21.5-RC3
  * Plugin URI:  https://yoa.st/1uj
  * Description: The first true all-in-one SEO solution for WordPress, including on-page content analysis, XML sitemaps and much more.
  * Author:      Team Yoast