Skip to content

Conversation

@backportbot-nextcloud
Copy link

@backportbot-nextcloud backportbot-nextcloud bot commented Feb 7, 2023

  • ⚠️ This backport had conflicts and is incomplete

backport of #36552 and #36634

@blizzz
Copy link
Member

blizzz commented Feb 7, 2023

@ChristophWurst conflicts

@blizzz blizzz added the 2. developing Work in progress label Feb 7, 2023
@ChristophWurst ChristophWurst force-pushed the backport/36552/stable24 branch from 244f579 to ba0fbdd Compare February 7, 2023 18:16
@ChristophWurst ChristophWurst added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Feb 7, 2023
Copy link
Member

@blizzz blizzz left a comment

Choose a reason for hiding this comment

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

1 question(s)

public function apptokenRedirect(string $stateToken, string $user, string $password) {
public function apptokenRedirect(?string $stateToken, string $user, string $password) {
if ($stateToken === null) {
return $this->loginTokenForbiddenResponse();
Copy link
Member

Choose a reason for hiding this comment

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

Forbidden or Missing?

Copy link
Member

Choose a reason for hiding this comment

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

Potato potato

@blizzz
Copy link
Member

blizzz commented Feb 9, 2023

moving to 24.0.11

@ChristophWurst ChristophWurst force-pushed the backport/36552/stable24 branch from ba0fbdd to 572f665 Compare February 9, 2023 13:09
@Antreesy Antreesy removed their request for review February 10, 2023 08:33
@MichaIng MichaIng added 2. developing Work in progress 3. to review Waiting for reviews and removed 3. to review Waiting for reviews 2. developing Work in progress labels Feb 27, 2023
@MichaIng
Copy link
Member

/rebase

@MichaIng MichaIng enabled auto-merge March 3, 2023 13:44
@juliusknorr juliusknorr disabled auto-merge March 6, 2023 11:53
@juliusknorr juliusknorr merged commit 6452b9d into stable24 Mar 6, 2023
@juliusknorr juliusknorr deleted the backport/36552/stable24 branch March 6, 2023 11:53
@blizzz blizzz mentioned this pull request Mar 13, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants