Merge branch '806-reset-email' into 'develop' (dfae0334) · 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

dfae0334

Commit dfae0334 authored 5 years ago by Eliot Berriot

Downloads
- Plain Diff

Merge branch '806-reset-email' into 'develop'

Fix #806: Use proper site name/domain in emails

Closes #806

See merge request !732

parents 71b7f416 39485c8e

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/templates/account/email/email_confirmation_message.txt 2 additions, 2 deletions

...pi/templates/account/email/email_confirmation_message.txt
api/funkwhale_api/templates/registration/password_reset_email.html 2 additions, 2 deletions

...hale_api/templates/registration/password_reset_email.html
api/funkwhale_api/users/adapters.py 12 additions, 1 deletion

api/funkwhale_api/users/adapters.py
api/funkwhale_api/users/serializers.py 2 additions, 2 deletions

api/funkwhale_api/users/serializers.py
api/tests/users/test_views.py 29 additions, 3 deletions

api/tests/users/test_views.py
changes/changelog.d/806.bugfix 1 addition, 0 deletions

changes/changelog.d/806.bugfix

with 48 additions and 10 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