Merge revert/release-5.2.1 into trunk

shendy-a8c · shendy-a8c · commit ec541afeb443 · 2022-12-30T15:18:02.000+07:00
diff --git a/changelog.txt b/changelog.txt
@@ -1,8 +1,5 @@
 *** WooCommerce Payments Changelog ***
 
-= 5.2.1 - 2022-12-30 =
-* Fix - UPE not loading on checkout page due to undefined i18n.
-
 = 5.2.0 - 2022-12-21 =
 * Add - Add WooPay Express Checkout button iframe functionality.
 * Add - When deactivating WCPay plugin, warn merchant that active WCPay Subscriptions will continue collecting payment.
diff --git a/changelog/fix-5197-required-checks-not-triggered-for-pr-created-by-workflow b/changelog/fix-5197-required-checks-not-triggered-for-pr-created-by-workflow
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+PR created by the code freeze workflow is now done by botwoo to allow PR checks to be triggered
diff --git a/changelog/fix-5347-undefined-i18n-upe b/changelog/fix-5347-undefined-i18n-upe
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+UPE not loading on checkout page due to undefined i18n.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "woocommerce-payments",
-  "version": "5.2.1",
+  "version": "5.2.0",
   "main": "webpack.config.js",
   "author": "Automattic",
   "license": "GPL-3.0-or-later",
diff --git a/readme.txt b/readme.txt
@@ -4,7 +4,7 @@ Tags: payment gateway, payment, apple pay, credit card, google pay
 Requires at least: 5.9
 Tested up to: 6.1
 Requires PHP: 7.0
-Stable tag: 5.2.1
+Stable tag: 5.2.0
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -98,9 +98,6 @@ Please note that our support for the checkout block is still experimental and th
 
 == Changelog ==
 
-= 5.2.1 - 2022-12-30 =
-* Fix - UPE not loading on checkout page due to undefined i18n.
-
 = 5.2.0 - 2022-12-21 =
 * Add - Add WooPay Express Checkout button iframe functionality.
 * Add - When deactivating WCPay plugin, warn merchant that active WCPay Subscriptions will continue collecting payment.
diff --git a/woocommerce-payments.php b/woocommerce-payments.php
@@ -12,7 +12,7 @@
  * WC tested up to: 7.2.0
  * Requires at least: 5.9
  * Requires PHP: 7.0
- * Version: 5.2.1
+ * Version: 5.2.0
  *
  * @package WooCommerce\Payments
  */

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "woocommerce-payments",`
`3`		`- "version": "5.2.1",`
	`3`	`+ "version": "5.2.0",`
`4`	`4`	`"main": "webpack.config.js",`
`5`	`5`	`"author": "Automattic",`
`6`	`6`	`"license": "GPL-3.0-or-later",`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`* WC tested up to: 7.2.0`
`13`	`13`	`* Requires at least: 5.9`
`14`	`14`	`* Requires PHP: 7.0`
`15`		`- * Version: 5.2.1`
	`15`	`+ * Version: 5.2.0`
`16`	`16`	`*`
`17`	`17`	`* @package WooCommerce\Payments`
`18`	`18`	`*/`