Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

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

Snippets Groups Projects

153900d3

Commit 153900d3 authored 5 years ago by Eliot Berriot

Downloads
- Plain Diff

Merge branch 'resend-confirmation-email' into 'develop'

See #1039: resend confirmation email on login if email is unverified

See merge request !1076

parents 372bd4a6 b07bd83f

No related branches found

No related tags found

Loading

Changes 9

Show whitespace changes

Inline Side-by-side

Showing

api/config/settings/common.py 1 addition, 1 deletion

api/config/settings/common.py
api/funkwhale_api/common/authentication.py 41 additions, 3 deletions

api/funkwhale_api/common/authentication.py
api/funkwhale_api/users/adapters.py 4 additions, 0 deletions

api/funkwhale_api/users/adapters.py
api/funkwhale_api/users/auth_backends.py 5 additions, 3 deletions

api/funkwhale_api/users/auth_backends.py
api/funkwhale_api/users/jwt_views.py 3 additions, 0 deletions

api/funkwhale_api/users/jwt_views.py
api/funkwhale_api/users/oauth/server.py 1 addition, 2 deletions

api/funkwhale_api/users/oauth/server.py
api/funkwhale_api/users/serializers.py 11 additions, 0 deletions

api/funkwhale_api/users/serializers.py
api/tests/users/oauth/test_views.py 12 additions, 2 deletions

api/tests/users/oauth/test_views.py
deploy/env.prod.sample 4 additions, 0 deletions

deploy/env.prod.sample

with 82 additions and 11 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