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

c5948996

Commit c5948996 authored 6 years ago by kaniini

Downloads
- Plain Diff

Merge branch 'reactivate' into 'develop'

Add user reactivation task.

Closes #338

See merge request pleroma/pleroma!404

parents a880e0a5 b92e38d2

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

lib/mix/tasks/deactivate_user.ex 1 addition, 1 deletion

lib/mix/tasks/deactivate_user.ex
lib/mix/tasks/reactivate_user.ex 13 additions, 0 deletions

lib/mix/tasks/reactivate_user.ex
lib/pleroma/user.ex 2 additions, 2 deletions

lib/pleroma/user.ex
lib/pleroma/web/activity_pub/activity_pub.ex 1 addition, 1 deletion

lib/pleroma/web/activity_pub/activity_pub.ex
test/user_test.exs 3 additions, 1 deletion

test/user_test.exs

with 20 additions and 5 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