Merge branch 'trunk' into ux_improve

WordPress · Mar 20, 2024 · 3d95dec · 3d95dec
2 parents 16794bd + bbb47e6
commit 3d95dec
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 32 deletions.
diff --git a/.distignore b/.distignore
@@ -22,7 +22,6 @@ tests
 .wp-env.json
 .wp-env.override.json
 behat.yml
-CODE_OF_CONDUCT.md
 codecov.yml
 composer.json
 composer.lock

diff --git a/.gitattributes b/.gitattributes
@@ -22,7 +22,6 @@
 /phpstan.neon.dist export-ignore
 /phpunit.xml.dist export-ignore
 
-/CODE_OF_CONDUCT.md export-ignore
 /CONTRIBUTING.md export-ignore
 /SECURITY.md export-ignore
 /README.md export-ignore

diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -11,7 +11,7 @@ In general, all code must follow the [WordPress Coding Standards and best practi
 
 ## Guidelines
 
-- As with all WordPress projects, we want to ensure a welcoming environment for everyone. With that in mind, all contributors are expected to follow our [Code of Conduct](/CODE_OF_CONDUCT.md).
+- As with all WordPress projects, we want to ensure a welcoming environment for everyone. With that in mind, all contributors are expected to follow our [Code of Conduct](https://make.wordpress.org/handbook/community-code-of-conduct/).
 
 - All WordPress projects are [licensed under the GPLv2+](/LICENSE), and all contributions to Gutenberg will be released under the GPLv2+ license. You maintain copyright over any contribution you make, and by submitting a pull request, you are agreeing to release that contribution under the GPLv2+ license.
 

diff --git a/package-lock.json b/package-lock.json