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
Boxiang Sun
gitlab-ce
Commits
153d3e57
Commit
153d3e57
authored
Feb 28, 2017
by
http://jneen.net/
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
don't require passwords for internal users
since they can't log in
parent
145f6fd0
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
1 deletion
+8
-1
app/models/user.rb
app/models/user.rb
+8
-1
No files found.
app/models/user.rb
View file @
153d3e57
...
@@ -958,6 +958,14 @@ class User < ActiveRecord::Base
...
@@ -958,6 +958,14 @@ class User < ActiveRecord::Base
self
.
admin
=
(
new_level
==
'admin'
)
self
.
admin
=
(
new_level
==
'admin'
)
end
end
protected
# override, from Devise::Validatable
def
password_required?
return
false
if
internal?
super
end
private
private
def
ci_projects_union
def
ci_projects_union
...
@@ -1058,7 +1066,6 @@ class User < ActiveRecord::Base
...
@@ -1058,7 +1066,6 @@ class User < ActiveRecord::Base
scope
.
create
(
scope
.
create
(
username:
username
,
username:
username
,
password:
Devise
.
friendly_token
,
email:
email
,
email:
email
,
&
creation_block
&
creation_block
)
)
...
...
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