Skip to content

Commit

Permalink
Merge branch 'trunk' into update/checkbox-appearance-conditions
Browse files Browse the repository at this point in the history
  • Loading branch information
jameskoster committed Feb 21, 2024
2 parents fbf3b94 + b7e936b commit 109ddee
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
3 changes: 0 additions & 3 deletions packages/editor/src/components/post-title/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,21 +25,18 @@ import { __unstableStripHTML as stripHTML } from '@wordpress/dom';
/**
* Internal dependencies
*/
import { store as editorStore } from '../../store';
import { DEFAULT_CLASSNAMES, REGEXP_NEWLINES } from './constants';
import usePostTitleFocus from './use-post-title-focus';
import usePostTitle from './use-post-title';
import PostTypeSupportCheck from '../post-type-support-check';

function PostTitle( _, forwardedRef ) {
const { placeholder, hasFixedToolbar } = useSelect( ( select ) => {
const { getEditedPostAttribute } = select( editorStore );
const { getSettings } = select( blockEditorStore );
const { titlePlaceholder, hasFixedToolbar: _hasFixedToolbar } =
getSettings();

return {
title: getEditedPostAttribute( 'title' ),
placeholder: titlePlaceholder,
hasFixedToolbar: _hasFixedToolbar,
};
Expand Down
4 changes: 4 additions & 0 deletions packages/env/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

## Unreleased

### Bug fix

- Fix `mariadb` version to LTS [#59237](https://github.com/WordPress/gutenberg/pull/59237)

## 9.3.0 (2024-02-09)

## 9.2.0 (2024-01-24)
Expand Down
4 changes: 2 additions & 2 deletions packages/env/lib/build-docker-compose-config.js
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ module.exports = function buildDockerComposeConfig( config ) {
version: '3.7',
services: {
mysql: {
image: 'mariadb',
image: 'mariadb:lts',
ports: [ '3306' ],
environment: {
MYSQL_ROOT_HOST: '%',
Expand All @@ -183,7 +183,7 @@ module.exports = function buildDockerComposeConfig( config ) {
volumes: [ 'mysql:/var/lib/mysql' ],
},
'tests-mysql': {
image: 'mariadb',
image: 'mariadb:lts',
ports: [ '3306' ],
environment: {
MYSQL_ROOT_HOST: '%',
Expand Down

0 comments on commit 109ddee

Please sign in to comment.