summaryrefslogtreecommitdiff
path: root/app/models/user.rb
diff options
context:
space:
mode:
authorAlexis Reigel <mail@koffeinfrei.org>2017-04-06 08:30:26 +0200
committerAlexis Reigel <mail@koffeinfrei.org>2017-04-06 10:01:14 +0200
commit01be21d42705d8d9857a0d4e5f3146a30b40352e (patch)
tree48f8f6e006c0192a3cd166815a80bda6ed3aee59 /app/models/user.rb
parent63e61cfd83bdc03d5c0657b5f93c3236d6a2d987 (diff)
downloadgitlab-ce-01be21d42705d8d9857a0d4e5f3146a30b40352e.tar.gz
user#update_two_factor_requirement is public
Diffstat (limited to 'app/models/user.rb')
-rw-r--r--app/models/user.rb16
1 files changed, 8 insertions, 8 deletions
diff --git a/app/models/user.rb b/app/models/user.rb
index 9c9c1f9c5da..c358b1b8d2b 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -963,14 +963,6 @@ class User < ActiveRecord::Base
self.admin = (new_level == 'admin')
end
- protected
-
- # override, from Devise::Validatable
- def password_required?
- return false if internal?
- super
- end
-
def update_two_factor_requirement
periods = expanded_groups_requiring_two_factor_authentication.pluck(:two_factor_grace_period)
@@ -980,6 +972,14 @@ class User < ActiveRecord::Base
save
end
+ protected
+
+ # override, from Devise::Validatable
+ def password_required?
+ return false if internal?
+ super
+ end
+
private
def ci_projects_union