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
0
Merge Requests
0
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
Jérome Perrin
gitlab-ce
Commits
2e8b0fa5
Commit
2e8b0fa5
authored
Oct 15, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Oauth users and users created by admin should be confirmed immediatly
parent
6fff92e9
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
0 deletions
+6
-0
app/controllers/admin/users_controller.rb
app/controllers/admin/users_controller.rb
+1
-0
lib/gitlab/oauth/user.rb
lib/gitlab/oauth/user.rb
+1
-0
spec/factories.rb
spec/factories.rb
+4
-0
No files found.
app/controllers/admin/users_controller.rb
View file @
2e8b0fa5
...
@@ -47,6 +47,7 @@ class Admin::UsersController < Admin::ApplicationController
...
@@ -47,6 +47,7 @@ class Admin::UsersController < Admin::ApplicationController
@user
=
User
.
build_user
(
params
[
:user
].
merge
(
opts
),
as: :admin
)
@user
=
User
.
build_user
(
params
[
:user
].
merge
(
opts
),
as: :admin
)
@user
.
admin
=
(
admin
&&
admin
.
to_i
>
0
)
@user
.
admin
=
(
admin
&&
admin
.
to_i
>
0
)
@user
.
created_by_id
=
current_user
.
id
@user
.
created_by_id
=
current_user
.
id
@user
.
confirm!
respond_to
do
|
format
|
respond_to
do
|
format
|
if
@user
.
save
if
@user
.
save
...
...
lib/gitlab/oauth/user.rb
View file @
2e8b0fa5
...
@@ -29,6 +29,7 @@ module Gitlab
...
@@ -29,6 +29,7 @@ module Gitlab
user
=
model
.
build_user
(
opts
,
as: :admin
)
user
=
model
.
build_user
(
opts
,
as: :admin
)
user
.
save!
user
.
save!
user
.
confirm!
log
.
info
"(OAuth) Creating user
#{
email
}
from login with extern_uid =>
#{
uid
}
"
log
.
info
"(OAuth) Creating user
#{
email
}
from login with extern_uid =>
#{
uid
}
"
if
Gitlab
.
config
.
omniauth
[
'block_auto_created_users'
]
&&
!
ldap?
if
Gitlab
.
config
.
omniauth
[
'block_auto_created_users'
]
&&
!
ldap?
...
...
spec/factories.rb
View file @
2e8b0fa5
...
@@ -23,6 +23,10 @@ FactoryGirl.define do
...
@@ -23,6 +23,10 @@ FactoryGirl.define do
end
end
factory
:admin
,
traits:
[
:admin
]
factory
:admin
,
traits:
[
:admin
]
after
:create
do
|
u
|
u
.
confirm!
end
end
end
factory
:project
do
factory
:project
do
...
...
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