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
GitLab community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Arbeitsgruppe Hardwarenahe IT-Systeme
Greenlight
Commits
347ed2bd
Commit
347ed2bd
authored
Jul 17, 2019
by
farhatahmad
Browse files
Options
Downloads
Patches
Plain Diff
Fixed issue with https redirect
parent
31b5e96b
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
app/controllers/application_controller.rb
+4
-4
4 additions, 4 deletions
app/controllers/application_controller.rb
with
4 additions
and
4 deletions
app/controllers/application_controller.rb
+
4
−
4
View file @
347ed2bd
...
...
@@ -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
...
...
@@ -138,7 +138,7 @@ class ApplicationController < ActionController::Base
# Checks to see if the user exists
begin
retrieve_provider_info
(
@user_domain
,
'api2'
,
'getUserGreenlightCredentials'
)
retrieve_provider_info
(
@user_domain
+
't'
,
'api2'
,
'getUserGreenlightCredentials'
)
rescue
=>
e
if
e
.
message
.
eql?
"No user with that id exists"
render
"errors/not_found"
,
locals:
{
message:
I18n
.
t
(
"errors.not_found.user_not_found.message"
),
...
...
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