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

Fix ACL rules for trashed subfolders from groupfolders #2631

Merged
merged 8 commits into from
Dec 12, 2023

Conversation

come-nc
Copy link
Contributor

@come-nc come-nc commented Nov 23, 2023

Cleaner version of #2629

@come-nc come-nc added the 3. to review Items that need to be reviewed label Nov 23, 2023
@come-nc come-nc self-assigned this Nov 23, 2023
lib/ACL/ACLManager.php Outdated Show resolved Hide resolved
lib/ACL/ACLManager.php Outdated Show resolved Hide resolved
lib/ACL/ACLManager.php Outdated Show resolved Hide resolved
lib/ACL/ACLManager.php Outdated Show resolved Hide resolved
lib/ACL/ACLManager.php Outdated Show resolved Hide resolved
lib/Trash/TrashBackend.php Show resolved Hide resolved
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
@come-nc come-nc force-pushed the fix/fix-acls-on-trash2 branch from 6c29faf to 1bab814 Compare December 4, 2023 13:47
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
this commit reverted later.

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
…same name

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
@come-nc come-nc force-pushed the fix/fix-acls-on-trash2 branch from 2a31ca2 to 5776790 Compare December 5, 2023 17:09
@come-nc
Copy link
Contributor Author

come-nc commented Dec 5, 2023

Rebased and squashed, good to review and merge @artonge @icewind1991

@come-nc come-nc requested a review from Altahrim December 7, 2023 14:50
Copy link
Contributor

@artonge artonge left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nitpick and question, but looks good 👍

lib/ACL/ACLManager.php Outdated Show resolved Hide resolved
lib/Trash/TrashBackend.php Show resolved Hide resolved
…pfolder

Co-authored-by: Louis <louis@chmn.me>
Signed-off-by: Côme Chilliet <91878298+come-nc@users.noreply.github.com>
@come-nc come-nc merged commit 96521d0 into master Dec 12, 2023
24 checks passed
@come-nc come-nc deleted the fix/fix-acls-on-trash2 branch December 12, 2023 17:06
@come-nc
Copy link
Contributor Author

come-nc commented Dec 21, 2023

/backport to stable28

@backportbot-nextcloud
Copy link

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

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

# Create the new backport branch
git checkout -b fix/foo-stable28

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123

# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable28

Error: Unknown error

More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport

@solracsf
Copy link
Member

Seems to be causing some issues: #2769

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
3. to review Items that need to be reviewed backport-request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants