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

73df3046

Commit 73df3046 authored 5 years ago by kaniini

Downloads
- Plain Diff

Merge branch 'feature/788-separate-email-addresses' into 'develop'

Feature/788 separate email addresses

Closes #788

See merge request !1040

parents 02a53d00 c5d0fffe

No related branches found

No related tags found

No related merge requests found

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

config/config.exs 1 addition, 0 deletions

config/config.exs
config/test.exs 4 additions, 0 deletions

config/test.exs
docs/config.md 4 additions, 3 deletions

docs/config.md
lib/mix/tasks/pleroma/instance.ex 15 additions, 2 deletions

lib/mix/tasks/pleroma/instance.ex
lib/mix/tasks/pleroma/sample_config.eex 1 addition, 1 deletion

lib/mix/tasks/pleroma/sample_config.eex
lib/pleroma/emails/admin_email.ex 5 additions, 2 deletions

lib/pleroma/emails/admin_email.ex
lib/pleroma/emails/user_email.ex 2 additions, 1 deletion

lib/pleroma/emails/user_email.ex
test/tasks/instance.exs 62 additions, 0 deletions

test/tasks/instance.exs
test/web/admin_api/admin_api_controller_test.exs 9 additions, 1 deletion

test/web/admin_api/admin_api_controller_test.exs
test/web/mastodon_api/mastodon_api_controller_test.exs 4 additions, 1 deletion

test/web/mastodon_api/mastodon_api_controller_test.exs
test/web/twitter_api/twitter_api_controller_test.exs 18 additions, 5 deletions

test/web/twitter_api/twitter_api_controller_test.exs
test/web/twitter_api/twitter_api_test.exs 8 additions, 1 deletion

test/web/twitter_api/twitter_api_test.exs

with 133 additions and 17 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