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

feat(files_trashbin): Allow preventing trash to be deleted permanently #50077

Merged

Conversation

provokateurin
Copy link
Member

Summary

Checklist

@provokateurin provokateurin added this to the Nextcloud 31 milestone Jan 7, 2025
@provokateurin provokateurin force-pushed the feat/files_trashbin/allow-preventing-trash-permanently branch from ddd844a to ff1b072 Compare January 8, 2025 06:48
@provokateurin provokateurin added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Jan 8, 2025
@provokateurin provokateurin marked this pull request as ready for review January 8, 2025 06:48
@provokateurin provokateurin requested review from a team, ArtificialOwl and artonge and removed request for a team January 8, 2025 06:49
@skjnldsv
Copy link
Member

skjnldsv commented Jan 8, 2025

Few minor comments, otherwise looks good! 👍
But please address them nonetheless

@provokateurin provokateurin force-pushed the feat/files_trashbin/allow-preventing-trash-permanently branch from ff1b072 to 5858070 Compare January 8, 2025 09:33
@blizzz blizzz mentioned this pull request Jan 8, 2025
@provokateurin provokateurin force-pushed the feat/files_trashbin/allow-preventing-trash-permanently branch from 5858070 to a0c36cc Compare January 13, 2025 08:29
@provokateurin
Copy link
Member Author

/compile

@provokateurin provokateurin force-pushed the feat/files_trashbin/allow-preventing-trash-permanently branch from 0c38de9 to 769b38f Compare January 13, 2025 14:19
@provokateurin provokateurin merged commit 87d7bbf into master Jan 13, 2025
188 checks passed
@provokateurin provokateurin deleted the feat/files_trashbin/allow-preventing-trash-permanently branch January 13, 2025 15:09
@skjnldsv skjnldsv mentioned this pull request Jan 14, 2025
@nickvergessen
Copy link
Member

/backport 26fa4da to stable30

@nickvergessen
Copy link
Member

/backport 26fa4da to stable29

@nickvergessen
Copy link
Member

Backporting the initial state change, so apps that support older versions and new ones can pass psalm again: nextcloud/announcementcenter#882

@provokateurin
Copy link
Member Author

Backporting the initial state change, so apps that support older versions and new ones can pass psalm again: nextcloud/announcementcenter#882

I don't see why you need to backport it for that? Apps only depend on a single OCP version, so you either have the baseline entry or you remove it.

@nickvergessen
Copy link
Member

I don't see why you need to backport it for that? Apps only depend on a single OCP version, so you either have the baseline entry or you remove it.

Apps that support against multiple versions, install all the different OCP versions on CI, so they check psalm against all those versions, which totally makes sense.
I have it in the baseline now and psalm complains that it would no longer be needed, but when I remove it stable30 fails.

Sign up for free to 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.

5 participants