Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
fb903de5
Commit
fb903de5
authored
Oct 21, 2012
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1740 from godric7/master
Enable Oauth login for existing regular users
parents
4e363c61
054c15e7
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
0 deletions
+4
-0
lib/gitlab/auth.rb
lib/gitlab/auth.rb
+4
-0
No files found.
lib/gitlab/auth.rb
View file @
fb903de5
...
@@ -48,9 +48,13 @@ module Gitlab
...
@@ -48,9 +48,13 @@ module Gitlab
def
find_or_new_for_omniauth
(
auth
)
def
find_or_new_for_omniauth
(
auth
)
provider
,
uid
=
auth
.
provider
,
auth
.
uid
provider
,
uid
=
auth
.
provider
,
auth
.
uid
email
=
auth
.
info
.
email
.
downcase
unless
auth
.
info
.
email
.
nil?
if
@user
=
User
.
find_by_provider_and_extern_uid
(
provider
,
uid
)
if
@user
=
User
.
find_by_provider_and_extern_uid
(
provider
,
uid
)
@user
@user
elsif
@user
=
User
.
find_by_email
(
email
)
@user
.
update_attributes
(
:extern_uid
=>
uid
,
:provider
=>
provider
)
@user
else
else
if
Gitlab
.
config
.
omniauth
[
'allow_single_sign_on'
]
if
Gitlab
.
config
.
omniauth
[
'allow_single_sign_on'
]
@user
=
create_from_omniauth
(
auth
)
@user
=
create_from_omniauth
(
auth
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment