[xwiki-notifications] [xwiki/xwiki-platform] 3f3f40: XWIKI-22351: The autosave triggers a merge conflic...

Branch: refs/heads/stable-15.10.x Home: https://github.com/xwiki/xwiki-platform Commit: 3f3f40ddec278d0815de978997bd34df5511f100 https://github.com/xwiki/xwiki-platform/commit/3f3f40ddec278d0815de978997bd… Author: Marius Dumitru Florea <marius(a)xwiki.com> Date: 2024-10-09 (Wed, 09 Oct 2024) Changed paths: M xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-test/xwiki-platform-ckeditor-test-docker/src/test/it/org/xwiki/ckeditor/test/ui/ImageIT.java M xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-test/xwiki-platform-ckeditor-test-docker/src/test/it/org/xwiki/ckeditor/test/ui/QuickActionsIT.java Log Message: ----------- XWIKI-22351: The autosave triggers a merge conflict sometimes even if there's no save done outside the realtime session * Update tests (when inserting a block widget from an empty paragraph, at the end of the edited content, the widget is inserted before that paragraph; the paragraph was previously wrongly considered as block separator in wiki syntax; moreover, CKEditor output a non-breaking space in empty paragraphs). (cherry picked from commit 9d0e2affff99152bf4e941e4a9ed9d95df8ab5fe) To unsubscribe from these emails, change your notification settings at https://github.com/xwiki/xwiki-platform/settings/notifications