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

bfe27c1b

Commit bfe27c1b authored 6 years ago by href

Downloads
- Plain Diff

Merge branch '114_email_invites' into 'develop'

[#114] Email invites

See merge request pleroma/pleroma!541

parents acec1162 69fd63e2

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

config/config.md 2 additions, 1 deletion

config/config.md
lib/pleroma/emails/user_email.ex 26 additions, 0 deletions

lib/pleroma/emails/user_email.ex
lib/pleroma/web/admin_api/admin_api_controller.ex 13 additions, 0 deletions

lib/pleroma/web/admin_api/admin_api_controller.ex
lib/pleroma/web/nodeinfo/nodeinfo_controller.ex 1 addition, 0 deletions

lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
lib/pleroma/web/router.ex 2 additions, 0 deletions

lib/pleroma/web/router.ex
lib/pleroma/web/twitter_api/controllers/util_controller.ex 2 additions, 1 deletion

lib/pleroma/web/twitter_api/controllers/util_controller.ex
test/web/admin_api/admin_api_controller_test.exs 99 additions, 0 deletions

test/web/admin_api/admin_api_controller_test.exs

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