Merge branch 'trunk' into release/1.120.0

# Conflicts: # gutenberg # ios-xcframework/Podfile.lock # package-lock.json # package.json
wordpress-mobile · Jun 6, 2024 · 066eae0 · 066eae0
2 parents 704b68e + 7191718
commit 066eae0
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 71 deletions.
diff --git a/.circleci/cache-version b/.circleci/cache-version
diff --git a/.circleci/setup-android-on-ubuntu.sh b/.circleci/setup-android-on-ubuntu.sh
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
@@ -6,6 +6,11 @@ Unreleased
 * [*] Prevent deleting content when backspacing in the first Paragraph block [https://github.com/wordpress-mobile/gutenberg-mobile/pull/6894]
 * [internal] Adds new bridge functionality to set editor content [https://github.com/wordpress-mobile/gutenberg-mobile/pull/6878]
 
+1.119.1
+---
+* [*] Image corrector - Check the path extension is a valid one [https://github.com/WordPress/gutenberg/pull/62190]
+* [*] Unsupported block - UI improvements [https://github.com/WordPress/gutenberg/pull/62240]
+
 1.119.0
 ---
 * [*] Cancel failed or in progress uploads if the media block is removed [https://github.com/wordpress-mobile/gutenberg-mobile/pull/6841]

diff --git a/__device-tests__/gutenberg-editor-functionality-test-1-visual.test.js b/__device-tests__/gutenberg-editor-functionality-test-1-visual.test.js
@@ -326,7 +326,8 @@ describe( 'Gutenberg Editor - Test Suite 1', () => {
 			expect( screenshot ).toMatchImageSnapshot();
 		} );
 
-		it( 'should display the block outline of a block inserted from the appender', async () => {
+		// Disabled until we fix the current regression with the inserter
+		it.skip( 'should display the block outline of a block inserted from the appender', async () => {
 			await editorPage.initializeEditor();
 
 			await editorPage.addNewBlock( blockNames.socialIcons );