about summary refs log tree commit diff
path: root/app
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2016-08-18 17:48:57 +0200
committerEugen Rochko <eugen@zeonfederated.com>2016-08-18 17:48:57 +0200
commit8459acd1234e9efcbf106e3eaa00ca871717d386 (patch)
tree48a67110262328e11db1dfb995a034b427e785c8 /app
parent6426819b6f7af0eff516340ca24d7f8af1cc6397 (diff)
Fix for force SSL issue with websockets
Diffstat (limited to 'app')
-rw-r--r--app/controllers/application_controller.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index b10fa977e..91f76d311 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -3,6 +3,8 @@ class ApplicationController < ActionController::Base
   # For APIs, you may want to use :null_session instead.
   protect_from_forgery with: :exception
 
+  force_ssl if: "ENV['LOCAL_HTTPS'] == 'true'"
+
   # Profiling
   before_action do
     if (current_user && current_user.admin?) || Rails.env == 'development'