diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-03-25 00:31:15 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-25 00:31:15 +0100 |
| commit | a2a85d5ae03282c6f9cbf452b9b8f7d948a9f380 (patch) | |
| tree | f3f15ea30de78e0fabaa5135a3b3c7b51053e4b6 /app/controllers | |
| parent | d7c1c41859549212a6d34ad869fded16acc17b48 (diff) | |
| parent | 5ea53b6158c42660aa61da2a49a3bbf9e2e406d0 (diff) | |
Merge pull request #1516 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
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 |