Skip to content

fix: Disable moving items from trash if there is no trash - #4947

Merged
icewind1991 merged 3 commits into
masterfrom
carl/disable-trash-move
Jul 24, 2026
Merged

fix: Disable moving items from trash if there is no trash#4947
icewind1991 merged 3 commits into
masterfrom
carl/disable-trash-move

Conversation

@CarlSchwan

Copy link
Copy Markdown
Member

πŸ€– AI (if applicable)

  • The content of this PR was partly or fully generated using AI

@CarlSchwan
CarlSchwan requested a review from icewind1991 July 24, 2026 12:17
@CarlSchwan CarlSchwan self-assigned this Jul 24, 2026
@CarlSchwan

Copy link
Copy Markdown
Member Author

/backport! to stable34

Signed-off-by: Carl Schwan <carl@carlschwan.eu>
Signed-off-by: Carl Schwan <carl@carlschwan.eu>
Signed-off-by: Carl Schwan <carl@carlschwan.eu>
@CarlSchwan
CarlSchwan force-pushed the carl/disable-trash-move branch from b5a2c37 to a27837d Compare July 24, 2026 12:41
@CarlSchwan

Copy link
Copy Markdown
Member Author

/backport! to stable34

@icewind1991
icewind1991 merged commit 5bbf6ec into master Jul 24, 2026
54 checks passed
@icewind1991
icewind1991 deleted the carl/disable-trash-move branch July 24, 2026 17:06
@CarlSchwan

Copy link
Copy Markdown
Member Author

/backport to stable34

@backportbot

backportbot Bot commented Jul 24, 2026

Copy link
Copy Markdown

The backport to stable34 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable34
git pull origin stable34

# Create the new backport branch
git checkout -b backport/4947/stable34

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts, resolve them
git cherry-pick c0c6800b 0c8aaaa7 a27837dc

# Push the cherry pick commit to the remote repository and open a pull request
git push origin backport/4947/stable34

Error: Failed to create pull request: Validation Failed: {"resource":"PullRequest","code":"custom","message":"A pull request already exists for nextcloud:backport/4947/stable34."} - https://docs.github.com/rest/pulls/pulls#create-a-pull-request


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

@CarlSchwan

Copy link
Copy Markdown
Member Author

/backport! to stable33

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.

2 participants