Skip to content

[stable20] set the display name of federated sharees from addressbook - #24353

Merged
rullzer merged 2 commits into
stable20from
backport/24162/stable20
Nov 25, 2020
Merged

[stable20] set the display name of federated sharees from addressbook#24353
rullzer merged 2 commits into
stable20from
backport/24162/stable20

Conversation

@backportbot-nextcloud

@backportbot-nextcloudbackportbot-nextcloudBot commented Nov 24, 2020

Copy link
Copy Markdown

⚠️ This backport had conflicts and is incomplete ⚠️ fixed

backport of #24162 and #24361

@blizzzblizzz added the 2. developing Work in progress label Nov 24, 2020
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
@blizzz
blizzzforce-pushed the backport/24162/stable20 branch from d566877 to c9814c7CompareNovember 24, 2020 22:37

@blizzzblizzz 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.

waiting for #24361

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
@faily-bot

faily-botBot commented Nov 25, 2020

Copy link
Copy Markdown

🤖 beep boop beep 🤖

Here are the logs for the failed build:

Status of 35944: failure

mysql8.0-php7.2

Show full log
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
--
There were 2 failures:
1) Test\Share20\DefaultShareProviderTest::testGetAccessListCurrentAccessRequired
Failed asserting that actual size 4 matches expected size 3.
/drone/src/tests/lib/Share20/DefaultShareProviderTest.php:2749
2) OCA\OAuth2\Tests\Db\ClientMapperTest::testGetByIdentifier
Failed asserting that two objects are equal.
--- Expected
+++ Actual
@@ @@
'redirectUri' => 'https://example.com/'
'clientIdentifier' => 'MyAwesomeClientIdentifier'
'secret' => 'TotallyNotSecret'
- 'id' => 0
+ 'id' => 1
'_updatedFields' => Array ()
'_fieldTypes' => Array (...)
)
/drone/src/apps/oauth2/tests/Db/ClientMapperTest.php:58

@ChristophWurstChristophWurst added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Nov 25, 2020
@rullzer
rullzer merged commit 2003995 into stable20Nov 25, 2020
@rullzer
rullzer deleted the backport/24162/stable20 branch November 25, 2020 15:18
This was referenced Dec 1, 2020
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.

5 participants

@blizzz@mcakircali@skjnldsv@rullzer@ChristophWurst