diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-03-24 10:53:50 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2021-03-24 10:53:50 +0100 |
| commit | f60c99a8fb0c99554fce091cac61d9ed07eef573 (patch) | |
| tree | 27457a4e091b820269daedb2f709ca304bcf5d06 /app/controllers | |
| parent | d7c1c41859549212a6d34ad869fded16acc17b48 (diff) | |
| parent | 88d69d3261c2f02278d07dc302ff7fc15bd68e8c (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/application_controller.rb | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 7e97009cf..7435d78bf 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -5,8 +5,6 @@ class ApplicationController < ActionController::Base # For APIs, you may want to use :null_session instead. protect_from_forgery with: :exception - force_ssl if: :https_enabled? - include Localized include UserTrackingConcern include SessionTrackingConcern @@ -43,10 +41,6 @@ class ApplicationController < ActionController::Base private - def https_enabled? - Rails.env.production? && !request.path.start_with?('/health') && !request.headers["Host"].end_with?(".onion") - end - def authorized_fetch_mode? ENV['AUTHORIZED_FETCH'] == 'true' || Rails.configuration.x.whitelist_mode end |