[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job...
authorIvan Tashkinov <ivantashkinov@gmail.com>
Thu, 22 Aug 2019 17:59:58 +0000 (20:59 +0300)
committerIvan Tashkinov <ivantashkinov@gmail.com>
Thu, 22 Aug 2019 17:59:58 +0000 (20:59 +0300)
commit256ff09aa8068166a9f83e3159f060fd4598af76
treea5e5efa83241f28d8d241b9d2d95ca4ceaefd286
parent8778c16dac1789eeb6dd51524573163216200b5d
parent73884441f31092bdb2f509950daf9bd3889a9a8b
[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue

# Conflicts:
# lib/pleroma/application.ex
# lib/pleroma/scheduled_activity_worker.ex
# lib/pleroma/web/federator/retry_queue.ex
# lib/pleroma/web/oauth/token/clean_worker.ex
# test/user_test.exs
# test/web/federator_test.exs
23 files changed:
config/config.exs
docs/config.md
lib/pleroma/application.ex
lib/pleroma/digest_email_worker.ex
lib/pleroma/scheduled_activity_worker.ex
lib/pleroma/user.ex
lib/pleroma/web/activity_pub/activity_pub.ex
lib/pleroma/web/activity_pub/publisher.ex
lib/pleroma/web/activity_pub/transmogrifier.ex
lib/pleroma/web/activity_pub/utils.ex
lib/pleroma/web/oauth/token/clean_worker.ex
test/conversation_test.exs
test/tasks/digest_test.exs
test/user_test.exs
test/web/activity_pub/activity_pub_controller_test.exs
test/web/activity_pub/activity_pub_test.exs
test/web/activity_pub/transmogrifier_test.exs
test/web/digest_email_worker_test.exs
test/web/federator_test.exs
test/web/instances/instance_test.exs
test/web/mastodon_api/mastodon_api_controller_test.exs
test/web/twitter_api/twitter_api_controller_test.exs
test/web/twitter_api/util_controller_test.exs