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

ce2efd1e

Commit ce2efd1e authored 6 years ago by kaniini

Downloads
- Plain Diff

Merge branch 'resilient-user-view-2' into 'develop'

MastoAPI: Don't break on missing users.

See merge request pleroma/pleroma!675

parents 608cc65d 943324b6

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

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

lib/pleroma/user.ex
lib/pleroma/web/mastodon_api/views/status_view.ex 16 additions, 3 deletions

lib/pleroma/web/mastodon_api/views/status_view.ex
lib/pleroma/web/twitter_api/views/activity_view.ex 1 addition, 11 deletions

lib/pleroma/web/twitter_api/views/activity_view.ex
test/web/mastodon_api/status_view_test.exs 30 additions, 0 deletions

test/web/mastodon_api/status_view_test.exs

with 57 additions and 14 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