Merge branch 'develop' into refactor/discoverable_user_field
authorMark Felder <feld@FreeBSD.org>
Tue, 13 Oct 2020 14:54:11 +0000 (09:54 -0500)
committerMark Felder <feld@FreeBSD.org>
Tue, 13 Oct 2020 14:54:11 +0000 (09:54 -0500)
commit4ead0d564fa60b1a908f6237474250d6bda85ae9
tree4a7852367e339f6759ccbabe70d6670e52cf171f
parent8bacdc36806efd01a7897359ff0fd2c8e24730d2
parent8b6221d4ecd1d7e354e7de831dd46e285cb85077
Merge branch 'develop' into refactor/discoverable_user_field
lib/pleroma/web/mastodon_api/controllers/account_controller.ex
lib/pleroma/web/metadata/providers/restrict_indexing.ex
test/pleroma/user_search_test.exs
test/pleroma/user_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/update_credentials_test.exs
test/pleroma/web/mastodon_api/views/account_view_test.exs
test/pleroma/web/metadata/providers/restrict_indexing_test.exs
test/pleroma/web/metadata_test.exs