diff options
| author | David Yip <yipdw@member.fsf.org> | 2018-01-07 13:30:52 -0600 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2018-01-07 13:30:52 -0600 |
| commit | f7c4d4464ba3b3729d707c54c4d2aa7515a9fe57 (patch) | |
| tree | b9dff90611207ec3dd075ca73fac32896dbab292 /app/controllers | |
| parent | 70c99a9f34b645baa65982dfec5351869c1924fe (diff) | |
| parent | c2e1bfd9ae3f5fe65c4918a37143d48a2cc12bb3 (diff) | |
Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-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 f997e9569..276c6b012 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 |