Merge branch 'develop' into refactor/deactivated_user_field
authorMark Felder <feld@feld.me>
Mon, 18 Jan 2021 20:58:21 +0000 (14:58 -0600)
committerMark Felder <feld@feld.me>
Mon, 18 Jan 2021 20:58:21 +0000 (14:58 -0600)
commit28581e03ad5761aa484a7fa427be8ab5695f0892
tree3296b3906ab31c6cebfa5fdc704fad83bf3bbee6
parent6c50ac1d3fb81e3fd7f0af90bab667e5e18193d6
parented84210da3eeee8e448a3a609f7c4da90d798038
Merge branch 'develop' into refactor/deactivated_user_field
20 files changed:
CHANGELOG.md
lib/mix/tasks/pleroma/email.ex
lib/mix/tasks/pleroma/user.ex
lib/pleroma/user.ex
lib/pleroma/user/query.ex
lib/pleroma/web/admin_api/views/account_view.ex
lib/pleroma/web/api_spec/operations/admin/report_operation.ex
lib/pleroma/web/api_spec/operations/admin/status_operation.ex
lib/pleroma/web/mastodon_api/views/account_view.ex
test/mix/tasks/pleroma/email_test.exs
test/mix/tasks/pleroma/user_test.exs
test/pleroma/user_test.exs
test/pleroma/web/activity_pub/side_effects_test.exs
test/pleroma/web/admin_api/controllers/status_controller_test.exs
test/pleroma/web/admin_api/controllers/user_controller_test.exs
test/pleroma/web/admin_api/search_test.exs
test/pleroma/web/mastodon_api/controllers/account_controller_test.exs
test/pleroma/web/mastodon_api/views/account_view_test.exs
test/pleroma/web/o_auth/o_auth_controller_test.exs
test/pleroma/web/plugs/user_enabled_plug_test.exs