Merge branch 'develop' into feature/database-compaction
authorrinpatch <rinpatch@sdf.org>
Wed, 17 Apr 2019 09:22:32 +0000 (12:22 +0300)
committerrinpatch <rinpatch@sdf.org>
Wed, 17 Apr 2019 09:22:32 +0000 (12:22 +0300)
commit627e5a0a4992cc19fc65a7e93a09c470c8e2bf33
tree0f38b475e8554863a1cbbd7750c19d4cd1336eb1
parentd6ab701a14f7c9fb4d59953648c425e04725fc62
parent73df3046e014ae16e03f16a9c82921652cefcb54
Merge branch 'develop' into feature/database-compaction
28 files changed:
lib/mix/tasks/compact_database.ex
lib/pleroma/activity.ex
lib/pleroma/gopher/server.ex
lib/pleroma/html.ex
lib/pleroma/object.ex
lib/pleroma/object/containment.ex
lib/pleroma/object/fetcher.ex
lib/pleroma/web/activity_pub/activity_pub.ex
lib/pleroma/web/activity_pub/activity_pub_controller.ex
lib/pleroma/web/activity_pub/transmogrifier.ex
lib/pleroma/web/activity_pub/utils.ex
lib/pleroma/web/common_api/common_api.ex
lib/pleroma/web/common_api/utils.ex
lib/pleroma/web/federator/federator.ex
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
lib/pleroma/web/mastodon_api/views/status_view.ex
lib/pleroma/web/ostatus/activity_representer.ex
lib/pleroma/web/ostatus/handlers/note_handler.ex
lib/pleroma/web/twitter_api/controllers/util_controller.ex
lib/pleroma/web/twitter_api/views/activity_view.ex
test/object_test.exs
test/web/activity_pub/activity_pub_test.exs
test/web/activity_pub/transmogrifier_test.exs
test/web/common_api/common_api_test.exs
test/web/mastodon_api/status_view_test.exs
test/web/ostatus/ostatus_test.exs
test/web/twitter_api/twitter_api_test.exs
test/web/twitter_api/views/activity_view_test.exs