Skip to content

[stable18] Fix sharing tab state not matching resharing admin settings - #24046

Merged
MorrisJobke merged 5 commits into
stable18from
backport/24042/stable18
Nov 11, 2020
Merged

[stable18] Fix sharing tab state not matching resharing admin settings#24046
MorrisJobke merged 5 commits into
stable18from
backport/24042/stable18

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/stable18 branch from 97bc2c6 to 4b8ff1eCompareNovember 11, 2020 11:53
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/stable18 branch from 4b8ff1e to 02fcb5eCompareNovember 11, 2020 12:47
@MorrisJobkeMorrisJobke 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 👍

@faily-bot

faily-botBot commented Nov 11, 2020

Copy link
Copy Markdown

🤖 beep boop beep 🤖

Here are the logs for the failed build:

Status of 35380: failure

handlebars

mysql5.6-php7.2

Show full log
There was 1 error:
1) OCA\DAV\Tests\unit\Connector\Sabre\RequestTest\EncryptionUploadTest::testChunkedUploadOutOfOrder
TypeError: Argument 1 passed to OCA\DAV\CalDAV\Activity\Backend::onCalendarAdd() must be of the type array, null given, called in /drone/src/apps/dav/lib/AppInfo/Application.php on line 173
/drone/src/apps/dav/lib/CalDAV/Activity/Backend.php:72
/drone/src/apps/dav/lib/AppInfo/Application.php:173
/drone/src/3rdparty/symfony/event-dispatcher/EventDispatcher.php:260
/drone/src/3rdparty/symfony/event-dispatcher/EventDispatcher.php:235
/drone/src/3rdparty/symfony/event-dispatcher/EventDispatcher.php:73
/drone/src/lib/private/EventDispatcher/SymfonyAdapter.php:70
/drone/src/apps/dav/lib/CalDAV/CalDavBackend.php:773
/drone/src/apps/dav/lib/HookManager.php:157
/drone/src/apps/dav/lib/AppInfo/Application.php:121
/drone/src/3rdparty/symfony/event-dispatcher/EventDispatcher.php:260
/drone/src/3rdparty/symfony/event-dispatcher/EventDispatcher.php:235
/drone/src/3rdparty/symfony/event-dispatcher/EventDispatcher.php:73
/drone/src/lib/private/EventDispatcher/SymfonyAdapter.php:70
/drone/src/lib/private/User/Session.php:562
/drone/src/lib/private/User/Session.php:414
/drone/src/lib/private/User/Session.php:617
/drone/src/lib/private/User/Session.php:368
/drone/src/apps/dav/tests/unit/Connector/Sabre/RequestTest/Auth.php:83
/drone/src/3rdparty/sabre/dav/lib/DAV/Auth/Plugin.php:201
/drone/src/3rdparty/sabre/dav/lib/DAV/Auth/Plugin.php:150
/drone/src/3rdparty/sabre/event/lib/EventEmitterTrait.php:105
/drone/src/3rdparty/sabre/dav/lib/DAV/Server.php:466
/drone/src/3rdparty/sabre/dav/lib/DAV/Server.php:254
/drone/src/apps/dav/tests/unit/Connector/Sabre/RequestTest/RequestTestCase.php:132
/drone/src/apps/dav/tests/unit/Connector/Sabre/RequestTest/RequestTestCase.php:114
/drone/src/apps/dav/tests/unit/Connector/Sabre/RequestTest/UploadTest.php:145
--
There were 2 warnings:
1) Test\Files\ViewTest::testRenameFailDeleteTargetKeepSource
Trying to configure method "writeStream" which cannot be configured because it does not exist, has not been specified, is final, or is static
2) Test\Files\ViewTest::testCopyFailDeleteTargetKeepSource
Trying to configure method "writeStream" which cannot be configured because it does not exist, has not been specified, is final, or is static

@MorrisJobke
MorrisJobke merged commit 59d07be into stable18Nov 11, 2020
@MorrisJobke
MorrisJobke deleted the backport/24042/stable18 branch November 11, 2020 14:45
@rullzerrullzer mentioned this pull request Nov 12, 2020
2 tasks
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