don't require passwords for internal users

since they can't log in

1 files changed, 8 insertions, 1 deletions

diff --git a/app/models/user.rb b/app/models/user.rb
index fa6f336f6b5..d725d37a355 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -958,6 +958,14 @@ class User < ActiveRecord::Base
     self.admin = (new_level == 'admin')
   end
 
+  protected
+
+  # override, from Devise::Validatable
+  def password_required?
+    return false if internal?
+    super
+  end
+
   private
 
   def ci_projects_union
@@ -1058,7 +1066,6 @@ class User < ActiveRecord::Base
 
     scope.create(
       username: username,
-      password: Devise.friendly_token,
       email: email,
       &creation_block
     )