Skip to content

Commit 26aafe7

Browse files
Merge branch 'WordPress:trunk' into trunk
2 parents 190b44e + 72a9996 commit 26aafe7

File tree

288 files changed

+3363
-2052
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

288 files changed

+3363
-2052
lines changed

bin/test-create-block.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ if [ "$expected" -ne "$actual" ]; then
5656
exit 1
5757
fi
5858
expected=7
59-
actual=$( find src -maxdepth 1 -type f | wc -l )
59+
actual=$( find src -maxdepth 2 -type f | wc -l )
6060
if [ "$expected" -ne "$actual" ]; then
6161
error "Expected $expected files in the \`src\` directory, but found $actual."
6262
exit 1
@@ -70,7 +70,7 @@ status "Building block..."
7070

7171
status "Verifying build..."
7272
expected=9
73-
actual=$( find build -maxdepth 1 -type f | wc -l )
73+
actual=$( find build -maxdepth 2 -type f | wc -l )
7474
if [ "$expected" -ne "$actual" ]; then
7575
error "Expected $expected files in the \`build\` directory, but found $actual."
7676
exit 1

changelog.txt

+453
Large diffs are not rendered by default.

docs/contributors/triage.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ To keep the repository healthy, it needs to be triaged regularly. **Triage is th
99
The triage team is an open group of people with a particular role of making sure triage is done consistently across the Gutenberg repo. There are various types of triage which happen:
1010

1111
- Regular self triage sessions done by members on their own time.
12-
- Organised triage sessions done as a group at a set time. You can [review the meetings page](https://make.wordpress.org/meetings/) to find these triage sessions and appropriate slack channels.
12+
- Organized triage sessions done as a group at a set time. You can [review the meetings page](https://make.wordpress.org/meetings/) to find these triage sessions and appropriate slack channels.
1313
- Focused triage sessions on a specific board, label or feature.
1414

1515
These are the expectations of being a triage team member:

gutenberg.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* Description: Printing since 1440. This is the development plugin for the block editor, site editor, and other future WordPress core functionality.
66
* Requires at least: 6.6
77
* Requires PHP: 7.2
8-
* Version: 19.9.0
8+
* Version: 20.0.0-rc.1
99
* Author: Gutenberg Team
1010
* Text Domain: gutenberg
1111
*

lib/block-supports/block-style-variations.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ function gutenberg_enqueue_block_style_variation_styles() {
273273
}
274274

275275
// Add Gutenberg filters and action.
276-
add_filter( 'render_block_data', 'gutenberg_render_block_style_variation_support_styles', 10, 2 );
276+
add_filter( 'render_block_data', 'gutenberg_render_block_style_variation_support_styles' );
277277
add_filter( 'render_block', 'gutenberg_render_block_style_variation_class_name', 10, 2 );
278278
add_action( 'wp_enqueue_scripts', 'gutenberg_enqueue_block_style_variation_styles', 1 );
279279

lib/experimental/kses-allowed-html.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,4 +40,4 @@ function gutenberg_kses_allowed_html( $allowedtags ) {
4040
);
4141
return $allowedtags;
4242
}
43-
add_filter( 'wp_kses_allowed_html', 'gutenberg_kses_allowed_html', 10, 2 );
43+
add_filter( 'wp_kses_allowed_html', 'gutenberg_kses_allowed_html' );

lib/rest-api.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ function gutenberg_override_global_styles_endpoint( array $args ): array {
2626

2727
return $args;
2828
}
29-
add_filter( 'register_wp_global_styles_post_type_args', 'gutenberg_override_global_styles_endpoint', 10, 2 );
29+
add_filter( 'register_wp_global_styles_post_type_args', 'gutenberg_override_global_styles_endpoint' );
3030

3131
/**
3232
* Registers the Edit Site Export REST API routes.

0 commit comments

Comments
 (0)