Skip to content

[stable19] Fix sharing tab state not matching resharing admin settings - #24045

Merged
MorrisJobke merged 5 commits into
stable19from
backport/24042/stable19
Nov 11, 2020
Merged

[stable19] Fix sharing tab state not matching resharing admin settings#24045
MorrisJobke merged 5 commits into
stable19from
backport/24042/stable19

Conversation

@backportbot-nextcloud

@backportbot-nextcloudbackportbot-nextcloudBot commented Nov 11, 2020

Copy link
Copy Markdown

⚠️ This backport had conflicts and is incomplete ⚠️

backport of #24042

@danxuliudanxuliu left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I will take care of the conflicts.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
@danxuliu
danxuliuforce-pushed the backport/24042/stable19 branch from 8fbf24d to cb62d94CompareNovember 11, 2020 10:47

@MorrisJobkeMorrisJobke left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

🐘

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
@danxuliu
danxuliuforce-pushed the backport/24042/stable19 branch from cb62d94 to 3af171dCompareNovember 11, 2020 12:47
@danxuliudanxuliu added the 3. to review Waiting for reviews label Nov 11, 2020

@danxuliudanxuliu left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Tested and works 👍

The php-cs check failure is unrelated, as it happens too in other backports to stable19.

@MorrisJobke

Copy link
Copy Markdown
Member

The php-cs check failure is unrelated, as it happens too in other backports to stable19.

Yep - need to look into this.

@MorrisJobke
MorrisJobke merged commit 742ac0f into stable19Nov 11, 2020
@MorrisJobke
MorrisJobke deleted the backport/24042/stable19 branch November 11, 2020 14:54
@rullzerrullzer mentioned this pull request Nov 12, 2020
1 task
Sign up for freeto 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.

2 participants

@MorrisJobke@danxuliu