summaryrefslogtreecommitdiff
path: root/app/views/notify/new_user_email.html.haml
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/views/notify/new_user_email.html.haml
parent00882b3c33cb377b903cdf8e2b91149081739785 (diff)
downloadgitlab-ce-6838304a85cd3b5dfdac076c600cb15f5643c674.tar.gz
Force user password change for users created by admin
Diffstat (limited to 'app/views/notify/new_user_email.html.haml')
-rw-r--r--app/views/notify/new_user_email.html.haml9
1 files changed, 5 insertions, 4 deletions
diff --git a/app/views/notify/new_user_email.html.haml b/app/views/notify/new_user_email.html.haml
index 9804fbdd51e..fc2c02ef827 100644
--- a/app/views/notify/new_user_email.html.haml
+++ b/app/views/notify/new_user_email.html.haml
@@ -8,13 +8,14 @@
%p
login..........................................
%code= @user['email']
-%p
- - unless Gitlab.config.gitlab.signup_enabled
+
+- if @user.created_by_id
+ %p
password..................................
%code= @password
-%p
- Please change your password immediately after login.
+ %p
+ You will be forced to change this password immediately after login.
%p
= link_to "Click here to login", root_url