Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge master to release for testing phase #17154

Merged
merged 157 commits into from
Sep 25, 2024
Merged

Merge master to release for testing phase #17154

merged 157 commits into from
Sep 25, 2024

Conversation

martnpaneq
Copy link
Contributor

Suggested merge commit message (convention)

Internal: Merge master to release for testing phase.


Additional information

For example – encountered issues, assumptions you had to make, other affected tickets, etc.

oleq and others added 30 commits August 28, 2024 12:48
Internal: Improved the resource class (machine) used on CI.
Internal: Upgrade several dependencies.
Internal: Restore the `medium` resource class for the notifier job. See #17011.
Internal: Merge release (v43.1.0) to stable.
Internal: Merge stable (v43.1.0) to master.
Mati365 and others added 27 commits September 23, 2024 07:53
Fix (engine): Fixed incorrect marker handling in some scenarios involving undo and real-time collaboration, which earlier led to a `model-nodelist-offset-out-of-bounds` error. See #9296.

Fix (engine): Fixed incorrect handling of merge changes during undo in some scenarios involving real-time collaboration, which earlier led to a `model-nodelist-offset-out-of-bounds` error. See #9296.

Fix (engine): Fixed conflict resolution error, which led to editor crash in some scenarios where two users removed bigger intersecting part of the content and used undo. See #9296.

Fix (engine): Fixed incorrect undo behavior leading to an editor crash when a user pressed enter key multiple times, then pressed backspace that many times, then undo all the changes. Closes #9296.
Other (engine): Performance improvements. Avoided creating unnecessary arrays. Closes #17143.
…troy

Tests: Add missing `editor.destroy` calls to tests.
Tests: Add await to some `editor.destroy` calls.
Internal: Merge release (v43.1.1) to stable.
Internal: Merge stable (v43.1.1) to master.
Internal: Fixed an invalid merge results by defining a correct version of `ckeditor5-code-block` in `ckeditor5-ui`.
Copy link
Contributor

@psmyrek psmyrek left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 🎉

@martnpaneq martnpaneq merged commit 52b5183 into release Sep 25, 2024
9 checks passed
@martnpaneq martnpaneq deleted the master_to_release branch September 25, 2024 10:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.