lino.jorzick
/
greenlight
forked from External/greenlight
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #655 from farhatahmad/2.2.0-hotfix 

GRN2-205: Fixed issue with https redirect
This commit is contained in:
Anton Georgiev 2019-07-17 14:14:38 -04:00 committed by GitHub
parent 31b5e96ba6 56be3a5b13
commit eb723be3d3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/controllers/application_controller.rb
View File

@ -23,6 +23,9 @@ class ApplicationController < ActionController::Base
include SessionsHelper include SessionsHelper
include ThemingHelper include ThemingHelper
# Force SSL for loadbalancer configurations.
before_action :redirect_to_https
before_action :migration_error? before_action :migration_error?
before_action :set_locale before_action :set_locale
before_action :check_admin_password before_action :check_admin_password
@ -32,9 +35,6 @@ class ApplicationController < ActionController::Base
# Manually handle BigBlueButton errors # Manually handle BigBlueButton errors
rescue_from BigBlueButton::BigBlueButtonException, with: :handle_bigbluebutton_error rescue_from BigBlueButton::BigBlueButtonException, with: :handle_bigbluebutton_error
# Force SSL for loadbalancer configurations.
before_action :redirect_to_https
protect_from_forgery with: :exception protect_from_forgery with: :exception
MEETING_NAME_LIMIT = 90 MEETING_NAME_LIMIT = 90