Merge branch 'release' into alpha

Automattic · Dec 16, 2024 · b90b11b · b90b11b
2 parents bff0dbd + 145c81b
commit b90b11b
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,9 +1,10 @@
-## [2.4.1-alpha.1](https://github.com/Automattic/newspack-theme/compare/v2.4.0...v2.4.1-alpha.1) (2024-12-12)
+## [2.4.1](https://github.com/Automattic/newspack-theme/compare/v2.4.0...v2.4.1) (2024-12-16)
 
 
 ### Bug Fixes
 
 * make captions styles more specific ([#2423](https://github.com/Automattic/newspack-theme/issues/2423)) ([b6f3c5b](https://github.com/Automattic/newspack-theme/commit/b6f3c5b76844171b26b25670571adc9614f77301))
+* workaround for block editor crash ([53cd463](https://github.com/Automattic/newspack-theme/commit/53cd4638d9ce269c3158b3aa1b02c3157403568c))
 
 # [2.4.0](https://github.com/Automattic/newspack-theme/compare/v2.3.0...v2.4.0) (2024-12-09)
 

diff --git a/newspack-joseph/sass/theme-description.scss b/newspack-joseph/sass/theme-description.scss
@@ -6,7 +6,7 @@ Author URI: https://newspack.com
 Description: The official theme for Newspack, an all-in-one platform that simplifies publishing and drives audience and revenue right out of the box.
 Requires at least: 6.6
 Tested up to: 6.7
-Version: 2.4.1-alpha.1
+Version: 2.4.1
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Template: newspack-theme

diff --git a/newspack-katharine/sass/theme-description.scss b/newspack-katharine/sass/theme-description.scss
@@ -6,7 +6,7 @@ Author URI: https://newspack.com
 Description: The official theme for Newspack, an all-in-one platform that simplifies publishing and drives audience and revenue right out of the box.
 Requires at least: 6.6
 Tested up to: 6.7
-Version: 2.4.1-alpha.1
+Version: 2.4.1
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Template: newspack-theme

diff --git a/newspack-nelson/sass/theme-description.scss b/newspack-nelson/sass/theme-description.scss
@@ -6,11 +6,7 @@ Author URI: https://newspack.com
 Description: The official theme for Newspack, an all-in-one platform that simplifies publishing and drives audience and revenue right out of the box.
 Requires at least: 6.6
 Tested up to: 6.7
-<<<<<<< HEAD
-Version: 2.4.1-alpha.1
-=======
-Version: 2.3.0
->>>>>>> release
+Version: 2.4.1
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Template: newspack-theme

diff --git a/newspack-sacha/sass/theme-description.scss b/newspack-sacha/sass/theme-description.scss
@@ -6,7 +6,7 @@ Author URI: https://newspack.com
 Description: The official theme for Newspack, an all-in-one platform that simplifies publishing and drives audience and revenue right out of the box.
 Requires at least: 6.6
 Tested up to: 6.7
-Version: 2.4.1-alpha.1
+Version: 2.4.1
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Template: newspack-theme

diff --git a/newspack-scott/sass/theme-description.scss b/newspack-scott/sass/theme-description.scss
@@ -6,7 +6,7 @@ Author URI: https://newspack.com
 Description: The official theme for Newspack, an all-in-one platform that simplifies publishing and drives audience and revenue right out of the box.
 Requires at least: 6.6
 Tested up to: 6.7
-Version: 2.4.1-alpha.1
+Version: 2.4.1
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Template: newspack-theme

diff --git a/newspack-theme/functions.php b/newspack-theme/functions.php
@@ -647,7 +647,7 @@ function newspack_fse_blocks_to_remove() {
 		'core/post-comments-form',
 		'core/comments-query-loop',
 		'core/query',
-		'core/post-title',
+		// 'core/post-title', Temporarily allow this block. Ref. https://github.com/woocommerce/woocommerce/pull/52209
 		'core/post-featured-image',
 		'core/post-excerpt',
 		'core/post-content',

diff --git a/newspack-theme/sass/theme-description.scss b/newspack-theme/sass/theme-description.scss
@@ -6,7 +6,7 @@ Author URI: https://newspack.com
 Description: The official theme for Newspack, an all-in-one platform that simplifies publishing and drives audience and revenue right out of the box.
 Requires at least: 6.6
 Tested up to: 6.7
-Version: 2.4.1-alpha.1
+Version: 2.4.1
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Text Domain: newspack

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "newspack",
-	"version": "2.4.1-alpha.1",
+	"version": "2.4.1",
 	"description": "A theme for Newspack. https://newspack.com",
 	"bugs": {
 		"url": "https://github.com/Automattic/newspack-theme/issues"