Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

P

pleroma
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

30dc8166

Commit 30dc8166 authored 6 years ago by href

Downloads
- Plain Diff

Merge branch '114_user_registration_emails' into 'develop'

[#114] User registration emails

Closes #114

See merge request pleroma/pleroma!531

parents 262cc6d4 f8121391

No related branches found

No related tags found

No related merge requests found

Changes 13

Hide whitespace changes

Inline Side-by-side

Showing

config/config.md 25 additions, 0 deletions

config/config.md
config/dev.exs 2 additions, 0 deletions

config/dev.exs
config/test.exs 2 additions, 0 deletions

config/test.exs
lib/pleroma/emails/mailer.ex 3 additions, 0 deletions

lib/pleroma/emails/mailer.ex
lib/pleroma/emails/user_email.ex 40 additions, 0 deletions

lib/pleroma/emails/user_email.ex
lib/pleroma/web/router.ex 18 additions, 0 deletions

lib/pleroma/web/router.ex
lib/pleroma/web/templates/twitter_api/util/password_reset_failed.html.eex 1 addition, 0 deletions

...templates/twitter_api/util/password_reset_failed.html.eex
lib/pleroma/web/templates/twitter_api/util/password_reset_success.html.eex 1 addition, 0 deletions

...emplates/twitter_api/util/password_reset_success.html.eex
lib/pleroma/web/twitter_api/twitter_api.ex 19 additions, 0 deletions

lib/pleroma/web/twitter_api/twitter_api.ex
lib/pleroma/web/twitter_api/twitter_api_controller.ex 11 additions, 0 deletions

lib/pleroma/web/twitter_api/twitter_api_controller.ex
mix.exs 3 additions, 1 deletion

mix.exs
mix.lock 2 additions, 0 deletions

mix.lock
test/web/twitter_api/twitter_api_controller_test.exs 42 additions, 1 deletion

test/web/twitter_api/twitter_api_controller_test.exs

with 169 additions and 2 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