Skip to content
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.

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

Prefer social account data over direct user data #1140

Merged
merged 5 commits into from
Jul 25, 2022
Merged

Conversation

jjnesbitt
Copy link
Member

@jjnesbitt jjnesbitt commented Jun 29, 2022

This fixes an unintentional behavior modification introduced in #1124, that caused user data to be displayed instead of any social account data.

dandiapi/api/views/users.py Outdated Show resolved Hide resolved
dandiapi/api/views/users.py Outdated Show resolved Hide resolved
@mvandenburgh
Copy link
Member

CI should pass if you rebase on master, now that #1146 is merged

jjnesbitt and others added 4 commits July 25, 2022 12:56
Co-authored-by: Mike VanDenburgh <37340715+mvandenburgh@users.noreply.github.com>
Co-authored-by: Mike VanDenburgh <37340715+mvandenburgh@users.noreply.github.com>
Copy link
Member

@mvandenburgh mvandenburgh left a comment

Choose a reason for hiding this comment

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

LGTM

@jjnesbitt jjnesbitt merged commit 9b92512 into master Jul 25, 2022
@jjnesbitt jjnesbitt deleted the fix-user-search branch July 25, 2022 21:28
@dandibot
Copy link
Member

🚀 PR was released in v0.2.40 🚀

@dandibot dandibot added the released This issue/pull request has been released. label Jul 26, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
released This issue/pull request has been released.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants