Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2018-01-07 15:17:13 +00:00
parent 5083311d64 1d92b90be9
commit c2e1bfd9ae
10 changed files with 73 additions and 22 deletions
--- 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