Skip to content

[stable32] Fix: Add cleanup for orphaned text steps - #7923

Merged
mejo- merged 7 commits into
stable32from
backport/7653/stable32
Nov 24, 2025
Merged

[stable32] Fix: Add cleanup for orphaned text steps#7923
mejo- merged 7 commits into
stable32from
backport/7653/stable32

Conversation

@backportbot

@backportbotbackportbotBot commented Nov 12, 2025

Copy link
Copy Markdown

Backport of #7653

Todo

  • Review and resolve any conflicts
  • Remove all the empty commits

Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.

@max-nextcloud

Copy link
Copy Markdown
Collaborator

@mejo- Why did you close this PR? Was it superseeded by another one?

@mejo-

Copy link
Copy Markdown
Member

I realized that it kind of depends on #7665, which should be backported and merged first. I agree though that both still should get backported.

@mejo-mejo- reopened this Nov 14, 2025
@mejo-
mejo-force-pushed the backport/7653/stable32 branch from 023416a to ca60436CompareNovember 14, 2025 14:15
@mejo-

Copy link
Copy Markdown
Member

I realized that it kind of depends on #7665, which should be backported and merged first. I agree though that both still should get backported.

After checking again, I realized now I was wrong. #7665 is already in stable32, but as both PRs got merged with a merge commit (and not with the branch being rebased), it's all a bit messy.

I reopened and updated this PR now so it should be ready to merge.

@mejo-
mejo- marked this pull request as ready for review November 14, 2025 14:16
@mejo-
mejo-force-pushed the backport/7653/stable32 branch from ca60436 to 1370950CompareNovember 14, 2025 14:18
@blizzzblizzz mentioned this pull request Nov 14, 2025
23 tasks
benjaminfruehand others added 7 commits November 24, 2025 11:42
Signed-off-by: Benjamin Frueh <benjamin.frueh@gmail.com>
Signed-off-by: Benjamin Frueh <benjamin.frueh@gmail.com>
Signed-off-by: Benjamin Frueh <benjamin.frueh@gmail.com>
…a safety buffer
Signed-off-by: Benjamin Frueh <benjamin.frueh@gmail.com>
…a safety buffer
Signed-off-by: Benjamin Frueh <benjamin.frueh@gmail.com>
Co-authored-by: max-nextcloud <max@nextcloud.com>
Signed-off-by: Benjamin Früh <134610227+benjaminfrueh@users.noreply.github.com>
Signed-off-by: Jonas <jonas@freesources.org>
@mejo-
mejo-force-pushed the backport/7653/stable32 branch from 1370950 to e10c24cCompareNovember 24, 2025 10:42
@mejo-
mejo- enabled auto-merge November 24, 2025 10:42
@mejo-
mejo- disabled auto-merge November 24, 2025 11:14
@mejo-
mejo- merged commit 70db771 into stable32Nov 24, 2025
64 of 66 checks passed
@mejo-
mejo- deleted the backport/7653/stable32 branch November 24, 2025 11:14
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@max-nextcloud@mejo-@blizzz@benjaminfrueh