Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

P

pleroma
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

49cf5f9c

Commit 49cf5f9c authored 6 years ago by kaniini

Downloads
- Plain Diff

Merge branch '471_invalid_accounts_rendering' into 'develop'

[#471] Prevented rendering of inactive local accounts

Closes #471

See merge request pleroma/pleroma!599

parents 89fbed88 0a417866

No related branches found

No related tags found

No related merge requests found

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

lib/pleroma/user.ex 8 additions, 0 deletions

lib/pleroma/user.ex
lib/pleroma/web/mastodon_api/views/account_view.ex 46 additions, 38 deletions

lib/pleroma/web/mastodon_api/views/account_view.ex
lib/pleroma/web/twitter_api/views/user_view.ex 32 additions, 23 deletions

lib/pleroma/web/twitter_api/views/user_view.ex

with 86 additions and 61 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment