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
984e5cc0
Commit
984e5cc0
authored
Jan 28, 2020
by
Ahmad Farhat
Committed by
Jesus Federico
Jan 28, 2020
Browse files
Options
Downloads
Patches
Plain Diff
Fixed 500 caused by 1 provider (#937)
parent
079d6479
Branches
Branches containing commit
Tags
release-2.4.2
release-2.4.2-rc.1
Tags containing commit
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
app/controllers/sessions_controller.rb
+4
-4
4 additions, 4 deletions
app/controllers/sessions_controller.rb
with
4 additions
and
4 deletions
app/controllers/sessions_controller.rb
+
4
−
4
View file @
984e5cc0
...
...
@@ -30,11 +30,13 @@ class SessionsController < ApplicationController
def
signin
check_if_twitter_account
@providers
=
configured_providers
if
one_provider
provider_path
=
if
Rails
.
configuration
.
omniauth_ldap
ldap_signin_path
else
"
#{
Rails
.
configuration
.
relative_url_root
}
/auth/
#{
providers
.
first
}
"
"
#{
Rails
.
configuration
.
relative_url_root
}
/auth/
#{
@
providers
.
first
}
"
end
return
redirect_to
provider_path
...
...
@@ -156,9 +158,7 @@ class SessionsController < ApplicationController
end
def
one_provider
providers
=
configured_providers
(
!
allow_user_signup?
||
!
allow_greenlight_accounts?
)
&&
providers
.
count
==
1
&&
(
!
allow_user_signup?
||
!
allow_greenlight_accounts?
)
&&
@providers
.
count
==
1
&&
!
Rails
.
configuration
.
loadbalanced_configuration
end
...
...
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