Merge branch 'federation-fixes' into 'develop' (433eb8db) · Commits · jovuit / funkwhale_OLD · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

funkwhale_OLD
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

433eb8db

Commit 433eb8db authored 6 years ago by Eliot Berriot

Downloads
- Plain Diff

Merge branch 'federation-fixes' into 'develop'

Federation fixes

See merge request funkwhale/funkwhale!134

parents 852bed6f f55d2b6c

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/permissions.py 2 additions, 1 deletion

api/funkwhale_api/federation/permissions.py
api/funkwhale_api/federation/serializers.py 4 additions, 2 deletions

api/funkwhale_api/federation/serializers.py
api/tests/federation/test_permissions.py 16 additions, 1 deletion

api/tests/federation/test_permissions.py
api/tests/federation/test_serializers.py 10 additions, 3 deletions

api/tests/federation/test_serializers.py
api/tests/federation/test_views.py 1 addition, 1 deletion

api/tests/federation/test_views.py
changes/changelog.d/federation-1.bugfix 1 addition, 0 deletions

changes/changelog.d/federation-1.bugfix

with 34 additions and 8 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