projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
c8d11c3
8d218eb
)
Merge branch 'oban-jobs-to-simple-tasks' into 'develop'
author
feld
<feld@feld.me>
Thu, 19 Nov 2020 20:32:32 +0000
(20:32 +0000)
committer
feld
<feld@feld.me>
Thu, 19 Nov 2020 20:32:32 +0000
(20:32 +0000)
Moving some background jobs into simple tasks
Closes #1790
See merge request pleroma/pleroma!3129
1
2
lib/pleroma/application.ex
patch
|
diff1
|
diff2
|
blob
|
history
lib/pleroma/web/activity_pub/activity_pub.ex
patch
|
diff1
|
diff2
|
blob
|
history
test/pleroma/web/mastodon_api/controllers/status_controller_test.exs
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
lib/pleroma/application.ex
Simple merge
diff --cc
lib/pleroma/web/activity_pub/activity_pub.ex
Simple merge
diff --cc
test/pleroma/web/mastodon_api/controllers/status_controller_test.exs
Simple merge