Commit 5b28bf1e5112c21232283e571b48483b659e70a3
Exists in
master
and in
4 other branches
Merge pull request #4705 from DarthNerdus/new-user-email
Add appropriate article to new user email.
Showing
2 changed files
with
2 additions
and
2 deletions
Show diff stats
app/views/notify/new_user_email.html.haml
| @@ -4,7 +4,7 @@ | @@ -4,7 +4,7 @@ | ||
| 4 | - if Gitlab.config.gitlab.signup_enabled | 4 | - if Gitlab.config.gitlab.signup_enabled |
| 5 | Your account has been created successfully. | 5 | Your account has been created successfully. |
| 6 | - else | 6 | - else |
| 7 | - The Administrator created an account for you. Now you are a member of company GitLab application. | 7 | + The Administrator created an account for you. Now you are a member of the company GitLab application. |
| 8 | %p | 8 | %p |
| 9 | login.......................................... | 9 | login.......................................... |
| 10 | %code= @user['email'] | 10 | %code= @user['email'] |
app/views/notify/new_user_email.text.erb
| 1 | Hi <%= @user.name %>! | 1 | Hi <%= @user.name %>! |
| 2 | 2 | ||
| 3 | -The Administrator created an account for you. Now you are a member of company GitLab application. | 3 | +The Administrator created an account for you. Now you are a member of the company GitLab application. |
| 4 | 4 | ||
| 5 | login.................. <%= @user.email %> | 5 | login.................. <%= @user.email %> |
| 6 | <% if @user.created_by_id %> | 6 | <% if @user.created_by_id %> |