Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

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

Snippets Groups Projects

0d960989

Commit 0d960989 authored 5 years ago by Haelwenn

Downloads
- Plain Diff

Merge branch 'feature/change-email' into 'develop'

Add email change endpoint

Closes #1156

See merge request pleroma/pleroma!1580

parents f884987a 7b5c81b3

Branches

Tags

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG.md 1 addition, 0 deletions

CHANGELOG.md
docs/api/pleroma_api.md 12 additions, 2 deletions

docs/api/pleroma_api.md
lib/pleroma/user.ex 9 additions, 0 deletions

lib/pleroma/user.ex
lib/pleroma/web/router.ex 1 addition, 0 deletions

lib/pleroma/web/router.ex
lib/pleroma/web/twitter_api/controllers/util_controller.ex 19 additions, 0 deletions

lib/pleroma/web/twitter_api/controllers/util_controller.ex
test/user_test.exs 27 additions, 0 deletions

test/user_test.exs
test/web/twitter_api/util_controller_test.exs 107 additions, 0 deletions

test/web/twitter_api/util_controller_test.exs

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