Merge branch 'actor-description' into 'develop' (b86971c3) · Commits · Martin Giger / funkwhale · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

funkwhale
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

b86971c3

Commit b86971c3 authored 5 years ago by Eliot Berriot

Downloads
- Plain Diff

Merge branch 'actor-description' into 'develop'

Actor description/summary

See merge request funkwhale/funkwhale!1002

parents 6785deb9 87bc011e

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

api/funkwhale_api/federation/migrations/0023_actor_summary_obj.py 20 additions, 0 deletions

...whale_api/federation/migrations/0023_actor_summary_obj.py
api/funkwhale_api/federation/models.py 3 additions, 0 deletions

api/funkwhale_api/federation/models.py
api/funkwhale_api/federation/serializers.py 35 additions, 20 deletions

api/funkwhale_api/federation/serializers.py
api/funkwhale_api/users/serializers.py 22 additions, 0 deletions

api/funkwhale_api/users/serializers.py
api/tests/federation/test_serializers.py 14 additions, 7 deletions

api/tests/federation/test_serializers.py
api/tests/users/test_views.py 24 additions, 1 deletion

api/tests/users/test_views.py

with 118 additions and 28 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