Merge branch '853-allow-listing-settings' into 'develop' (fc6eb636) · Commits · Zwordi / funkwhale · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

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

Snippets Groups Projects

fc6eb636

Commit fc6eb636 authored 5 years ago by Eliot Berriot

Downloads
- Plain Diff

Merge branch '853-allow-listing-settings' into 'develop'

Model / settings for allow-listing

See merge request funkwhale/funkwhale!781

parents 1a52dfcc 2b2b64f0

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

api/funkwhale_api/federation/admin.py 2 additions, 1 deletion

api/funkwhale_api/federation/admin.py
api/funkwhale_api/federation/migrations/0019_auto_20190611_0851.py 19 additions, 0 deletions

...hale_api/federation/migrations/0019_auto_20190611_0851.py
api/funkwhale_api/federation/models.py 3 additions, 0 deletions

api/funkwhale_api/federation/models.py
api/funkwhale_api/manage/serializers.py 6 additions, 0 deletions

api/funkwhale_api/manage/serializers.py
api/funkwhale_api/manage/views.py 8 additions, 0 deletions

api/funkwhale_api/manage/views.py
api/funkwhale_api/moderation/dynamic_preferences_registry.py 26 additions, 0 deletions

api/funkwhale_api/moderation/dynamic_preferences_registry.py
api/tests/manage/test_serializers.py 1 addition, 0 deletions

api/tests/manage/test_serializers.py
api/tests/manage/test_views.py 25 additions, 0 deletions

api/tests/manage/test_views.py

with 90 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