summaryrefslogtreecommitdiff
path: root/app/models/user.rb
diff options
context:
space:
mode:
authorNathan Bush <nathan@pfmediatech.com>2016-05-05 10:40:49 -0400
committerNathan Bush <nathan@pfmediatech.com>2016-06-23 11:52:05 -0400
commit64883faa6ebffd1e67d36d537e1e0bf2196bf107 (patch)
treee58fe9013dd994c0e28e0b1c4d7adad6f314eefb /app/models/user.rb
parent26b957771974aee4457af5edf389509eb1ac80e7 (diff)
downloadgitlab-ce-64883faa6ebffd1e67d36d537e1e0bf2196bf107.tar.gz
Fix user creation with stronger minimum password requirements:q
Diffstat (limited to 'app/models/user.rb')
-rw-r--r--app/models/user.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/user.rb b/app/models/user.rb
index 876ccc69d8d..04b220ee13c 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -308,7 +308,7 @@ class User < ActiveRecord::Base
def generate_password
if self.force_random_password
- self.password = self.password_confirmation = Devise.friendly_token.first(8)
+ self.password = self.password_confirmation = Devise.friendly_token.first(Devise.password_length.min)
end
end