Skip to content

[stable18] Show federation and email results also with exact user match unless c… #23088

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
Oct 1, 2020
Merged

[stable18] Show federation and email results also with exact user match unless c… #23088

merged 1 commit into from
Oct 1, 2020

Conversation

backportbot-nextcloud[bot]
Copy link

@backportbot-nextcloud backportbot-nextcloud bot commented Sep 29, 2020 •
edited by nickvergessen
Loading

⚠️ This backport had conflicts and is incomplete ⚠️

backport of #23013

@backportbot-nextcloud backportbot-nextcloud bot added this to the Nextcloud 18.0.10 milestone Sep 29, 2020
@rullzer rullzer added the 3. to review Waiting for reviews label Sep 29, 2020
@rullzer rullzer mentioned this pull request Sep 29, 2020
Merged
1 task
@rullzer
Copy link
Member

rullzer commented Oct 1, 2020

@nickvergessen backport is incomplete

@nickvergessen
Show federation and email results also with exact user match unless c…
af2868c 
…ontaining @

Before when you have a user "smith" and a federated user "smith@example.com"
you could see the federation result with "smit" but not with "smith" anymore.
With most LDAP configurations and local backend setups this is disturbing and
causes issues.
The idea of not showing the email and federation on a matching user was with:
Local user registered with "smith@example.com" user id and having that same
email / cloud id in your contacts addressbook. So we now only hide those
"side results" when the search does contain an @

Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen nickvergessen force-pushed the backport/23013/stable18 branch from 668dbc0 to af2868c Compare October 1, 2020 07:35
@rullzer rullzer added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Oct 1, 2020
@faily-bot
Copy link

faily-bot bot commented Oct 1, 2020

🤖 beep boop beep 🤖

Here are the logs for the failed build:

Status of 33522: failure

mariadb10.4-php7.3

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 was 1 failure:

1) OCA\Files_Versions\Tests\VersioningTest::testRestoreMovedShare
File content has not changed
Failed asserting that two strings are equal.
--- Expected
+++ Actual
@@ @@
-'version 2'
+'version 1'

/drone/src/apps/files_versions/tests/VersioningTest.php:730

@rullzer rullzer merged commit 79660f6 into stable18 Oct 1, 2020
@rullzer rullzer deleted the backport/23013/stable18 branch October 1, 2020 09:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rullzer rullzer rullzer approved these changes

@nickvergessen nickvergessen nickvergessen approved these changes

@blizzz blizzz Awaiting requested review from blizzz

@ChristophWurst ChristophWurst Awaiting requested review from ChristophWurst

@icewind1991 icewind1991 Awaiting requested review from icewind1991

@MorrisJobke MorrisJobke Awaiting requested review from MorrisJobke

Assignees
No one assigned
Labels
4. to release Ready to be released and/or waiting for tests to finish bug feature: federation feature: sharing
Projects
None yet
Milestone
Nextcloud 18.0.10
Development

Successfully merging this pull request may close these issues.
2 participants
@rullzer @nickvergessen