From 97539b6a96c1a3773aceb492d213620132d2a1fb Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Mon, 17 May 2021 22:36:08 +0200
Subject: Fix host check on healthcheck path not being disabled (#16270)

Fixes #16251

There was a typo in #16243
---
 config/initializers/1_hosts.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'config/initializers')

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
-- 
cgit 


From b715cede4d5c773fc759ba654400be94c9a7c446 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Mon, 24 May 2021 03:02:46 +0200
Subject: Fix mailer jobs for deleted notifications erroring out (#16294)

Fixes an oversight in the Rails 6 migration
---
 config/initializers/delivery_job.rb      | 3 ---
 config/initializers/mail_delivery_job.rb | 3 +++
 2 files changed, 3 insertions(+), 3 deletions(-)
 delete mode 100644 config/initializers/delivery_job.rb
 create mode 100644 config/initializers/mail_delivery_job.rb

(limited to 'config/initializers')

diff --git a/config/initializers/delivery_job.rb b/config/initializers/delivery_job.rb
deleted file mode 100644
index cc2927272..000000000
--- a/config/initializers/delivery_job.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-ActionMailer::DeliveryJob.class_eval do
-  discard_on ActiveJob::DeserializationError
-end
diff --git a/config/initializers/mail_delivery_job.rb b/config/initializers/mail_delivery_job.rb
new file mode 100644
index 000000000..327817396
--- /dev/null
+++ b/config/initializers/mail_delivery_job.rb
@@ -0,0 +1,3 @@
+ActionMailer::MailDeliveryJob.class_eval do
+  discard_on ActiveJob::DeserializationError
+end
-- 
cgit