Merge branch 'glitch'

Conflicts:
	yarn.lock: caniuse-lite has been outdated in upstream for
	awhile, and we fixed it a few weeks ago in our fork

2 files changed, 2 insertions, 2 deletions

diff --git a/config/initializers/1_hosts.rb b/config/initializers/1_hosts.rb
index f470fddb3..6ff0845c4 100644
--- a/config/initializers/1_hosts.rb
+++ b/config/initializers/1_hosts.rb
@@ -31,6 +31,6 @@ Rails.application.configure do
     config.hosts << host if host.present?
     config.hosts << web_host if web_host.present?
     config.hosts.concat(alternate_domains) if alternate_domains.present?
-    config.hosts_authorization = { exclude: ->(request) { request.path == '/health' } }
+    config.host_authorization = { exclude: ->(request) { request.path == '/health' } }
   end
 end
diff --git a/config/initializers/delivery_job.rb b/config/initializers/mail_delivery_job.rb
index cc2927272..327817396 100644
--- a/config/initializers/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