Skip to content

Conversation

@miaulalala
Copy link
Contributor

Manual backport of #39481

@miaulalala miaulalala added the 3. to review Waiting for reviews label Aug 17, 2023
@miaulalala miaulalala requested a review from a team August 17, 2023 13:10
@miaulalala miaulalala self-assigned this Aug 17, 2023
@miaulalala miaulalala requested review from ArtificialOwl, blizzz and nfebe and removed request for a team August 17, 2023 13:10
@miaulalala miaulalala changed the title fix: don't emit Hooks when hookpaths are empty [stable25] fix: don't emit Hooks when hookpaths are empty Aug 17, 2023
@miaulalala
Copy link
Contributor Author

linter is giving me 905 files lol

@solracsf solracsf added this to the Nextcloud 25.0.11 milestone Aug 17, 2023
@miaulalala
Copy link
Contributor Author

Failing test is unrelated (acceptance-users) :

--- Failed scenarios:
229 |  
230 | /drone/src/tests/acceptance/features/users.feature:25
231

@miaulalala miaulalala added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Aug 21, 2023
@miaulalala miaulalala force-pushed the fix/stable25/transfer-ownership branch from f89b6bd to e84230f Compare August 21, 2023 07:20
@max-nextcloud
Copy link
Contributor

max-nextcloud commented Aug 28, 2023

php-cs check passed for another PR (#40008) - so i will try and rebase this so it runs again.

@max-nextcloud max-nextcloud force-pushed the fix/stable25/transfer-ownership branch from e84230f to 8d0047f Compare August 28, 2023 09:07
Comment on lines 822 to 833
// moving a file/folder within the same mount point
// moving a file/folder within the same mount point
} elseif ($storage1 === $storage2) {
if ($storage1) {
$result = $storage1->rename($internalPath1, $internalPath2);
} else {
$result = false;
}
// moving a file/folder between storages (from $storage1 to $storage2)
// moving a file/folder between storages (from $storage1 to $storage2)
Copy link
Contributor

Choose a reason for hiding this comment

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

Looks like the linter does not like this.
I'll move the comments into the respective block.

@max-nextcloud max-nextcloud force-pushed the fix/stable25/transfer-ownership branch from 8d0047f to 1e957b5 Compare August 28, 2023 09:45
@miaulalala
Copy link
Contributor Author

Thanks @max-nextcloud !!!

Drone failure unrelated:

--- Failed scenarios:
--
229 |  
230 | /drone/src/tests/acceptance/features/users.feature:25

@max-nextcloud
Copy link
Contributor

Now if only someone could merge this despite the failing CI
@ChristophWurst @juliushaertl

🥺

😉

@nickvergessen nickvergessen merged commit 9ea2d7c into stable25 Aug 28, 2023
@nickvergessen nickvergessen deleted the fix/stable25/transfer-ownership branch August 28, 2023 11:38
@blizzz blizzz mentioned this pull request Sep 5, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

4. to release Ready to be released and/or waiting for tests to finish 25-feedback bug

Projects

Development

Successfully merging this pull request may close these issues.

6 participants