Merge pull request #655 from farhatahmad/2.2.0-hotfix

GRN2-205: Fixed issue with https redirect
bigbluebutton · Jul 17, 2019 · eb723be · eb723be
2 parents 31b5e96 + 56be3a5
commit eb723be
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
@@ -23,6 +23,9 @@ class ApplicationController < ActionController::Base
   include SessionsHelper
   include ThemingHelper
 
+  # Force SSL for loadbalancer configurations.
+  before_action :redirect_to_https
+
   before_action :migration_error?
   before_action :set_locale
   before_action :check_admin_password
@@ -32,9 +35,6 @@ class ApplicationController < ActionController::Base
   # Manually handle BigBlueButton errors
   rescue_from BigBlueButton::BigBlueButtonException, with: :handle_bigbluebutton_error
 
-  # Force SSL for loadbalancer configurations.
-  before_action :redirect_to_https
-
   protect_from_forgery with: :exception
 
   MEETING_NAME_LIMIT = 90