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

74e10937

Commit 74e10937 authored 6 years ago by kaniini

Downloads
- Plain Diff

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

Make TwAPI UserView more resilient to issues.

See merge request pleroma/pleroma!634

parents b640cf0c 7382adf4

Branches

No related tags found

No related merge requests found

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

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

lib/pleroma/user.ex
lib/pleroma/web/twitter_api/views/activity_view.ex 15 additions, 1 deletion

lib/pleroma/web/twitter_api/views/activity_view.ex
test/web/twitter_api/views/activity_view_test.exs 28 additions, 0 deletions

test/web/twitter_api/views/activity_view_test.exs

with 52 additions and 1 deletion

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