Skip to content

Conversation

@backportbot-nextcloud
Copy link

@backportbot-nextcloud backportbot-nextcloud bot commented May 17, 2022

⚠️ This backport had conflicts and is incomplete ⚠️

backport of #372

@backportbot-nextcloud backportbot-nextcloud bot added this to the Nextcloud 23.0.5 milestone May 17, 2022
@KDederichs
Copy link
Contributor

Ok, it ate the changes to lib/OperatingSystems/FreeBSD.php no clue how to fix that :)

@blizzz
Copy link
Member

blizzz commented May 19, 2022

Ok, it ate the changes to lib/OperatingSystems/FreeBSD.php no clue how to fix that :)

check out this branch and commit and push fixes to it.

@KDederichs
Copy link
Contributor

I have no write permission here so that's a bit difficult....

@blizzz
Copy link
Member

blizzz commented May 20, 2022

I have no write permission here so that's a bit difficult....

Ah! Okay, you've been invited :)

@kesselb
Copy link
Collaborator

kesselb commented Jun 2, 2022

/rebase

@KDederichs
Copy link
Contributor

Yeah not sure how to best get it to do that check.... Github is weird that way....

@kesselb
Copy link
Collaborator

kesselb commented Jun 2, 2022

Yeah not sure how to best get it to do that check.... Github is weird that way....

Can you rebase your branch to stable23? This should get the latest changes in and hopefully trigger a CI re run.

@KDederichs
Copy link
Contributor

@kesselb I mean I can, but it's not really my branch anyways since the backport bot opened it so who ever wants to do it, it's fine by me :)

@KDederichs
Copy link
Contributor

Alas it'd be neat if someone did it, I rarely rebase stuff and before I break something I'd rather someone else do it

…d or mac

Signed-off-by: Kai Dederichs <[email protected]>

Make test throw when requesting a non-valid interface

Signed-off-by: Kai Dederichs <[email protected]>

Backport FreeBSD.php to stable23

Signed-off-by: Kai Dederichs <[email protected]>

Fix CS

Signed-off-by: Kai Dederichs <[email protected]>
@kesselb kesselb force-pushed the backport/372/stable23 branch from 46353b8 to fb73c95 Compare June 2, 2022 13:31
@kesselb
Copy link
Collaborator

kesselb commented Jun 2, 2022

@KDederichs done. All changes are there? ;)

@KDederichs
Copy link
Contributor

Looking good yeah, but I guess that one is still not running? Or does it depend on the PHPUnit one?

@kesselb kesselb merged commit c0055d0 into stable23 Jun 3, 2022
@delete-merged-branch delete-merged-branch bot deleted the backport/372/stable23 branch June 3, 2022 07:57
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