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

Conflicts: - `README.md`: our READMEs are entirely different and upstream's has been updated. Kept our README.
2021-05-17 10:30:34 +02:00
parent 678e07c544 4c7efdba40
commit 69737b703a
50 changed files with 1824 additions and 1549 deletions
@@ -31,5 +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' } }
  end
 end