Merge branch 'feature/47-django2.0' into 'develop'
Feature/47 django2.0 Closes #47 See merge request funkwhale/funkwhale!29
Showing
- .gitlab-ci.yml 11 additions, 3 deletions.gitlab-ci.yml
- CHANGELOG 4 additions, 0 deletionsCHANGELOG
- api/Dockerfile 3 additions, 1 deletionapi/Dockerfile
- api/config/api_urls.py 16 additions, 6 deletionsapi/config/api_urls.py
- api/config/settings/common.py 1 addition, 1 deletionapi/config/settings/common.py
- api/config/settings/local.py 1 addition, 1 deletionapi/config/settings/local.py
- api/config/settings/production.py 1 addition, 1 deletionapi/config/settings/production.py
- api/config/settings/test.py 2 additions, 2 deletionsapi/config/settings/test.py
- api/config/urls.py 2 additions, 2 deletionsapi/config/urls.py
- api/funkwhale_api/common/permissions.py 1 addition, 1 deletionapi/funkwhale_api/common/permissions.py
- api/funkwhale_api/contrib/sites/migrations/0001_initial.py 1 addition, 1 deletionapi/funkwhale_api/contrib/sites/migrations/0001_initial.py
- api/funkwhale_api/favorites/migrations/0001_initial.py 2 additions, 2 deletionsapi/funkwhale_api/favorites/migrations/0001_initial.py
- api/funkwhale_api/favorites/models.py 4 additions, 2 deletionsapi/funkwhale_api/favorites/models.py
- api/funkwhale_api/favorites/tests/test_favorites.py 1 addition, 1 deletionapi/funkwhale_api/favorites/tests/test_favorites.py
- api/funkwhale_api/history/migrations/0001_initial.py 2 additions, 2 deletionsapi/funkwhale_api/history/migrations/0001_initial.py
- api/funkwhale_api/history/models.py 8 additions, 2 deletionsapi/funkwhale_api/history/models.py
- api/funkwhale_api/history/tests/factories.py 12 additions, 0 deletionsapi/funkwhale_api/history/tests/factories.py
- api/funkwhale_api/history/tests/test_history.py 6 additions, 5 deletionsapi/funkwhale_api/history/tests/test_history.py
- api/funkwhale_api/history/views.py 2 additions, 2 deletionsapi/funkwhale_api/history/views.py
- api/funkwhale_api/music/migrations/0001_initial.py 6 additions, 6 deletionsapi/funkwhale_api/music/migrations/0001_initial.py
Loading
Please register or sign in to comment