Skip to content

fix(files): show proper information when a move will override the target - #60631

Merged
artonge merged 2 commits into
masterfrom
backport/60615/master
Jun 3, 2026
Merged

fix(files): show proper information when a move will override the target#60631
artonge merged 2 commits into
masterfrom
backport/60615/master

Conversation

@backportbot

@backportbot backportbot Bot commented May 20, 2026

Copy link
Copy Markdown

Backport of #60615

Warning, This backport's changes differ from the original and might be incomplete ⚠️

Todo

  • Review and resolve any conflicts
  • Review and verify the backported changes
  • Amend HEAD commit to remove the line stating to skip CI

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

@backportbot backportbot Bot added bug 3. to review Waiting for reviews feature: files team: Files Code maintained by 📁 Files team labels May 20, 2026
@susnux susnux changed the title [master] [stable32] fix(files): show proper information when a move will override the target fix(files): show proper information when a move will override the target May 20, 2026
@susnux susnux added this to the Nextcloud 35 milestone May 20, 2026
@susnux
susnux force-pushed the backport/60615/master branch from 7c45327 to a149c06 Compare May 20, 2026 22:42
@susnux
susnux marked this pull request as ready for review May 20, 2026 22:42
@susnux
susnux requested review from a team and skjnldsv as code owners May 20, 2026 22:42
@susnux
susnux requested review from nfebe and removed request for a team May 20, 2026 22:42
@susnux

susnux commented May 20, 2026

Copy link
Copy Markdown
Contributor

/backport to stable34

@susnux

susnux commented May 20, 2026

Copy link
Copy Markdown
Contributor

/backport to stable33

@susnux
susnux force-pushed the backport/60615/master branch 2 times, most recently from 4f7d8eb to 012069e Compare May 24, 2026 12:32
@susnux

susnux commented Jun 1, 2026

Copy link
Copy Markdown
Contributor

/compile rebase

@susnux
susnux force-pushed the backport/60615/master branch 2 times, most recently from d61cdfa to cf7d18f Compare June 2, 2026 20:50
susnux added 2 commits June 3, 2026 11:19
Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
@susnux
susnux force-pushed the backport/60615/master branch from cf7d18f to 7e38471 Compare June 3, 2026 09:29
@artonge
artonge merged commit eda0d2c into master Jun 3, 2026
133 of 141 checks passed
@artonge
artonge deleted the backport/60615/master branch June 3, 2026 12:49
@nextcloud-bot nextcloud-bot mentioned this pull request Aug 11, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

3. to review Waiting for reviews bug feature: files team: Files Code maintained by 📁 Files team

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants