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
88d4559e
Commit
88d4559e
authored
Sep 11, 2013
by
Izaak Alpert
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Removed private scope
Change-Id: Ia723321a5cb05deb626d34c7d8d78194e049b1f0
parent
810851f5
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
3 deletions
+1
-3
app/models/user.rb
app/models/user.rb
+0
-2
lib/gitlab/oauth/user.rb
lib/gitlab/oauth/user.rb
+1
-1
No files found.
app/models/user.rb
View file @
88d4559e
...
@@ -383,8 +383,6 @@ class User < ActiveRecord::Base
...
@@ -383,8 +383,6 @@ class User < ActiveRecord::Base
end
end
end
end
private
def
with_defaults
def
with_defaults
User
.
defaults
.
each
do
|
k
,
v
|
User
.
defaults
.
each
do
|
k
,
v
|
self
.
send
(
"
#{
k
}
="
,
v
)
self
.
send
(
"
#{
k
}
="
,
v
)
...
...
lib/gitlab/oauth/user.rb
View file @
88d4559e
...
@@ -27,7 +27,7 @@ module Gitlab
...
@@ -27,7 +27,7 @@ module Gitlab
password_confirmation:
password
,
password_confirmation:
password
,
}
}
user
=
model
.
new
(
opts
,
as: :admin
).
with_defaults
user
=
model
.
build_user
(
opts
,
as: :admin
)
user
.
save!
user
.
save!
log
.
info
"(OAuth) Creating user
#{
email
}
from login with extern_uid =>
#{
uid
}
"
log
.
info
"(OAuth) Creating user
#{
email
}
from login with extern_uid =>
#{
uid
}
"
...
...
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