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
01be21d4
Commit
01be21d4
authored
Apr 06, 2017
by
Alexis Reigel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
user#update_two_factor_requirement is public
parent
63e61cfd
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
8 deletions
+8
-8
app/models/user.rb
app/models/user.rb
+8
-8
No files found.
app/models/user.rb
View file @
01be21d4
...
@@ -963,14 +963,6 @@ class User < ActiveRecord::Base
...
@@ -963,14 +963,6 @@ 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
def
update_two_factor_requirement
def
update_two_factor_requirement
periods
=
expanded_groups_requiring_two_factor_authentication
.
pluck
(
:two_factor_grace_period
)
periods
=
expanded_groups_requiring_two_factor_authentication
.
pluck
(
:two_factor_grace_period
)
...
@@ -980,6 +972,14 @@ class User < ActiveRecord::Base
...
@@ -980,6 +972,14 @@ class User < ActiveRecord::Base
save
save
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
...
...
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