Skip to content

Commit

Permalink
Merge pull request #5826 from Automattic/develop
Browse files Browse the repository at this point in the history
Staging release: v20240827.1
  • Loading branch information
rinatkhaziev authored Aug 27, 2024
2 parents 994b89f + 0968d6b commit 7b916ce
Show file tree
Hide file tree
Showing 9 changed files with 117 additions and 190 deletions.
2 changes: 1 addition & 1 deletion .github/actions/run-wp-tests/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ runs:
uses: ramsey/[email protected]

- name: Set up WordPress and WordPress Test Library
uses: sjinks/setup-wordpress-test-library@2.0.2
uses: sjinks/setup-wordpress-test-library@v2.0.3
with:
version: ${{ inputs.wordpress }}

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@ jobs:
uses: actions/[email protected]

- name: Initialize CodeQL
uses: github/codeql-action/[email protected].3
uses: github/codeql-action/[email protected].5
with:
languages: ${{ matrix.language }}
config-file: ./.github/codeql-config.yml

- name: Perform CodeQL Analysis
uses: github/codeql-action/[email protected].3
uses: github/codeql-action/[email protected].5
7 changes: 3 additions & 4 deletions __tests__/e2e/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 blogpublic-notice.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ function notice() {

printf(
'<div id="blogpublic-notice" class="notice notice-warning is-dismissible"><p>Your site may be discoverable. You can change this by <a href="%s">disabling content distribution</a>.</p></div>',
'https://docs.wpvip.com/technical-references/restricting-site-access/controlling-content-distribution-via-jetpack/#h-disabling-content-distribution',
'https://docs.wpvip.com/wordpress-on-vip/jetpack/content-distribution/#h-disabling-content-distribution',
);
add_action( 'admin_footer', __NAMESPACE__ . '\dismiss_handler' );
}
Expand Down
1 change: 1 addition & 0 deletions drop-ins/wp-memcached/includes/wp-object-cache.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
use Automattic\Memcached\Stats;

// Note that this class is in the global namespace for backwards-compatibility reasons.
#[\AllowDynamicProperties]
class WP_Object_Cache {
public string $flush_group = 'WP_Object_Cache';
public string $global_flush_group = 'WP_Object_Cache_global';
Expand Down
48 changes: 24 additions & 24 deletions 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 search/search-dev-tools/build/bundle.js

Large diffs are not rendered by default.

Loading

0 comments on commit 7b916ce

Please sign in to comment.