Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

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

Snippets Groups Projects

8b194641

Commit 8b194641 authored 5 years ago by feld

Downloads
- Plain Diff

Merge branch 'feature/multiple-users-force-password-reset' into 'develop'

Force password reset for multiple users

Closes admin-fe#46

See merge request pleroma/pleroma!1928

parents be6e5e01 2cbfa256

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG.md 1 addition, 0 deletions

CHANGELOG.md
docs/API/admin_api.md 3 additions, 3 deletions

docs/API/admin_api.md
lib/pleroma/moderation_log.ex 11 additions, 0 deletions

lib/pleroma/moderation_log.ex
lib/pleroma/web/admin_api/admin_api_controller.ex 9 additions, 3 deletions

lib/pleroma/web/admin_api/admin_api_controller.ex
lib/pleroma/web/router.ex 1 addition, 1 deletion

lib/pleroma/web/router.ex
test/web/admin_api/admin_api_controller_test.exs 1 addition, 1 deletion

test/web/admin_api/admin_api_controller_test.exs

with 26 additions and 8 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