summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHaunui Saint-sevin <haunui.ss@gmail.com>2019-06-04 00:50:41 +0000
committerHaunui Saint-sevin <haunui.ss@gmail.com>2019-06-04 21:18:11 +0000
commit1475206bcccb12c14ed4b230af66a56b7f11e4df (patch)
tree54c773d7d5c0c4ae62d908ff348bb901832dcb56
parent3de4d313a353e2133da5adc9140ce939e76eed94 (diff)
downloadgitlab-ce-1475206bcccb12c14ed4b230af66a56b7f11e4df.tar.gz
Sync text part of email with the HTML part
The text part was missing the condition to change the first message. Borrow the code from the HTML part.
-rw-r--r--app/views/notify/new_user_email.text.erb5
1 files changed, 5 insertions, 0 deletions
diff --git a/app/views/notify/new_user_email.text.erb b/app/views/notify/new_user_email.text.erb
index d5aba21b8b7..7e0db75472d 100644
--- a/app/views/notify/new_user_email.text.erb
+++ b/app/views/notify/new_user_email.text.erb
@@ -1,8 +1,13 @@
Hi <%= sanitize_name(@user.name) %>!
+<% if Gitlab::CurrentSettings.allow_signup? %>
+Your account has been created successfully.
+<% else %>
The Administrator created an account for you. Now you are a member of the company GitLab application.
+<% end %>
login.................. <%= @user.email %>
+
<% if @user.created_by_id %>
Click here to set your password:
<%= edit_password_url(@user, :reset_password_token => @token) %>