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

2021-02-22 15:23:46 +01:00
parent 8792128f38 2127f40e6b
commit 679642e26c
56 changed files with 761 additions and 359 deletions
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -44,7 +44,7 @@ class ApplicationController < ActionController::Base
  private

  def https_enabled?
-    Rails.env.production? && !request.path.start_with?('/health') && !request.headers["Host"].ends_with?(".onion")
+    Rails.env.production? && !request.path.start_with?('/health') && !request.headers["Host"].end_with?(".onion")
  end

  def authorized_fetch_mode?