Skip to content

🤖 Merge 1.7.x-sync into master#725

Merged
MetRonnie merged 14 commits intomasterfrom
1.7.x-sync
Sep 5, 2025
Merged

🤖 Merge 1.7.x-sync into master#725
MetRonnie merged 14 commits intomasterfrom
1.7.x-sync

Conversation

@github-actions
Copy link
Contributor

@github-actions github-actions bot commented Sep 4, 2025

Important

Please do a normal merge, not squash merge.

Please fix conflicts if necessary.


Triggered by push

jfrost-mo and others added 6 commits August 4, 2025 14:26
Compared to the default by character sort this ensures that 2 is sorted
before 10, etc.

Fixes: cylc/cylc-ui#2263
Signed-off-by: James Frost <james.frost@metoffice.gov.uk>
Use a human friendly sort order for log files
* handle websocket closed error

* reduced debug header info

* changelog entry added
@github-actions github-actions bot added the sync PR for synchronising changes between *.*.x and master label Sep 4, 2025
github-actions bot and others added 8 commits September 4, 2025 15:54
@MetRonnie
Copy link
Member

Tests failing without #729 merged

@MetRonnie
Copy link
Member

Kicking

@MetRonnie MetRonnie closed this Sep 5, 2025
@MetRonnie MetRonnie reopened this Sep 5, 2025
@MetRonnie MetRonnie merged commit 01bdad6 into master Sep 5, 2025
8 of 12 checks passed
@MetRonnie MetRonnie deleted the 1.7.x-sync branch September 5, 2025 13:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

sync PR for synchronising changes between *.*.x and master

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants