aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/application.ex
diff options
context:
space:
mode:
authorIvan Tashkinov <ivantashkinov@gmail.com>2019-08-31 14:25:43 +0300
committerIvan Tashkinov <ivantashkinov@gmail.com>2019-08-31 14:25:43 +0300
commite890ea7e821d61fca75084d46f70ed125acf1fc8 (patch)
tree7994c0be9f90b39a9ed46bbfd9f04fce70a14671 /lib/pleroma/application.ex
parentcd78e63a2528ab813088d5e44a026f6bb05b344b (diff)
parent6d33c89c4d27a1b52e69e1c14b408726410a6326 (diff)
downloadpleroma-e890ea7e821d61fca75084d46f70ed125acf1fc8.tar.gz
[#1149] Added Oban job for "activity_expiration". Merged remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
# Conflicts: # config/config.exs
Diffstat (limited to 'lib/pleroma/application.ex')
-rw-r--r--lib/pleroma/application.ex3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/pleroma/application.ex b/lib/pleroma/application.ex
index ce2d3ab59..7d38ed5c4 100644
--- a/lib/pleroma/application.ex
+++ b/lib/pleroma/application.ex
@@ -36,7 +36,8 @@ defmodule Pleroma.Application do
Pleroma.Emoji,
Pleroma.Captcha,
Pleroma.FlakeId,
- Pleroma.ScheduledActivityWorker
+ Pleroma.ScheduledActivityWorker,
+ Pleroma.ActivityExpirationWorker
] ++
cachex_children() ++
hackney_pool_children() ++