Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
G
Greenlight
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Arbeitsgruppe Hardwarenahe IT-Systeme
Greenlight
Commits
eb723be3
Unverified
Commit
eb723be3
authored
5 years ago
by
Anton Georgiev
Committed by
GitHub
5 years ago
Browse files
Options
Downloads
Plain Diff
Merge pull request #655 from farhatahmad/2.2.0-hotfix
GRN2-205: Fixed issue with https redirect
parents
31b5e96b
56be3a5b
Branches
Branches containing commit
Tags
release-2.2.1
Tags containing commit
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
app/controllers/application_controller.rb
+3
-3
3 additions, 3 deletions
app/controllers/application_controller.rb
with
3 additions
and
3 deletions
app/controllers/application_controller.rb
+
3
−
3
View file @
eb723be3
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment