Merge branch 'main' into glitch-soc/merge-upstream

Conflicts: - `README.md`: Upstream's README got updated, but we have a completely different one. Kept ours.
2021-05-27 17:58:44 +02:00
parent 2024aef0f9 2efe711a51
commit 10a31a934f
13 changed files with 136 additions and 193 deletions
--- a/config/initializers/mail_delivery_job.rb
+++ b/config/initializers/mail_delivery_job.rb
@@ -1,3 +1,3 @@
-ActionMailer::DeliveryJob.class_eval do
+ActionMailer::MailDeliveryJob.class_eval do
  discard_on ActiveJob::DeserializationError
 end