summaryrefslogtreecommitdiff
path: root/app/models
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-06-13 21:06:27 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-06-13 21:06:27 +0300
commit6838304a85cd3b5dfdac076c600cb15f5643c674 (patch)
tree61785561cb8fde46b41630b0a6ad60ca8eb24b02 /app/models
parent00882b3c33cb377b903cdf8e2b91149081739785 (diff)
downloadgitlab-ce-6838304a85cd3b5dfdac076c600cb15f5643c674.tar.gz
Force user password change for users created by admin
Diffstat (limited to 'app/models')
-rw-r--r--app/models/user.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/app/models/user.rb b/app/models/user.rb
index 3f92ca3f854..6de8d2d4c39 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -367,4 +367,8 @@ class User < ActiveRecord::Base
def accessible_deploy_keys
DeployKey.in_projects(self.master_projects).uniq
end
+
+ def created_by
+ User.find_by_id(created_by_id) if created_by_id
+ end
end