diff options
| author | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-01-07 15:17:13 +0000 |
|---|---|---|
| committer | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-01-07 15:17:13 +0000 |
| commit | c2e1bfd9ae3f5fe65c4918a37143d48a2cc12bb3 (patch) | |
| tree | eb2c9fd328b985d7d388e4a6f9543e0a1180a9e8 /app/controllers | |
| parent | 5083311d64f427771609e444b87c0c39cb6f8ac2 (diff) | |
| parent | 1d92b90be9f494d90a6f79f53be9cca68562867e (diff) | |
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/application_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index f3d8f6966..175c25cd6 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -31,7 +31,7 @@ class ApplicationController < ActionController::Base private def https_enabled? - Rails.env.production? && ENV['LOCAL_HTTPS'] == 'true' + Rails.env.production? end def store_current_location |