Skip to content

Commit

Permalink
Merge pull request #2177 from woocommerce/trunk
Browse files Browse the repository at this point in the history
Release 2.5.13 - Merge `trunk` to `develop`
  • Loading branch information
martynmjones authored Dec 6, 2023
2 parents 402a574 + 90d4872 commit abb5fcb
Show file tree
Hide file tree
Showing 9 changed files with 236 additions and 232 deletions.
4 changes: 4 additions & 0 deletions changelog.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
*** WooCommerce Google Listings and Ads Changelog ***

= 2.5.13 - 2023-12-06 =
* Fix - Change Budget Recommendations values.
* Tweak - Use a single daily budget instead of a range.

= 2.5.12 - 2023-11-22 =
* Dev - Fix E2E gtag events tests.
* Dev - Update WordPress CS to 3.0.
Expand Down
4 changes: 2 additions & 2 deletions google-listings-and-ads.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Plugin Name: Google Listings and Ads
* Plugin URL: https://wordpress.org/plugins/google-listings-and-ads/
* Description: Native integration with Google that allows merchants to easily display their products across Google’s network.
* Version: 2.5.12
* Version: 2.5.13
* Author: WooCommerce
* Author URI: https://woo.com/
* Text Domain: google-listings-and-ads
Expand All @@ -30,7 +30,7 @@

defined( 'ABSPATH' ) || exit;

define( 'WC_GLA_VERSION', '2.5.12' ); // WRCS: DEFINED_VERSION.
define( 'WC_GLA_VERSION', '2.5.13' ); // WRCS: DEFINED_VERSION.
define( 'WC_GLA_MIN_PHP_VER', '7.4' );
define( 'WC_GLA_MIN_WC_VER', '6.9' );

Expand Down
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "google-listings-and-ads",
"title": "Google Listings and Ads",
"version": "2.5.12",
"version": "2.5.13",
"description": "google-listings-and-ads",
"author": "Automattic",
"license": "GPL-3.0-or-later",
Expand Down
10 changes: 5 additions & 5 deletions readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Requires at least: 5.9
Tested up to: 6.4
Requires PHP: 7.4
Requires PHP Architecture: 64 Bits
Stable tag: 2.5.12
Stable tag: 2.5.13
License: GPLv3
License URI: https://www.gnu.org/licenses/gpl-3.0.html

Expand Down Expand Up @@ -111,6 +111,10 @@ Yes, you can run both at the same time, and we recommend it! In the US, advertis

== Changelog ==

= 2.5.13 - 2023-12-06 =
* Fix - Change Budget Recommendations values.
* Tweak - Use a single daily budget instead of a range.

= 2.5.12 - 2023-11-22 =
* Dev - Fix E2E gtag events tests.
* Dev - Update WordPress CS to 3.0.
Expand All @@ -125,8 +129,4 @@ Yes, you can run both at the same time, and we recommend it! In the US, advertis
* Tweak - WP 6.4 compatibility.
* Update - Use new Woo.com domain.

= 2.5.10 - 2023-10-18 =
* Tweak - Add correct Destinations for Supported Countries in Coupons.
* Tweak - Declare cart_checkout_blocks feature compatibility.

[See changelog for all versions](https://raw.githubusercontent.com/woocommerce/google-listings-and-ads/trunk/changelog.txt).
4 changes: 2 additions & 2 deletions src/DB/Migration/Migration20231109T1653383133.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
*
* @package Automattic\WooCommerce\GoogleListingsAndAds\DB\Migration
*
* @since x.x.x
* @since 2.5.13
*/
class Migration20231109T1653383133 extends AbstractMigration {

Expand All @@ -41,7 +41,7 @@ public function __construct( \wpdb $wpdb, BudgetRecommendationTable $budget_rate
* @return string A version number. For example: 1.4.1
*/
public function get_applicable_version(): string {
return 'x.x.x';
return '2.5.13';
}

/**
Expand Down
2 changes: 1 addition & 1 deletion src/DB/Table.php
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ protected function get_collation(): string {
*
* @return bool True if the column exists on the table or False if not.
*
* @since x.x.x
* @since 2.5.13
*/
public function has_column( string $column_name ): bool {
// phpcs:disable WordPress.DB.PreparedSQL.NotPrepared
Expand Down
2 changes: 1 addition & 1 deletion src/DB/TableInterface.php
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ public function has_index( string $index_name ): bool;
*
* @return bool True if the column exists on the table or False if not.
*
* @since x.x.x
* @since 2.5.13
*/
public function has_column( string $column_name ): bool;
}
438 changes: 219 additions & 219 deletions src/Hooks/README.md

Large diffs are not rendered by default.

0 comments on commit abb5fcb

Please sign in to comment.