diff options
| author | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2013-08-05 08:16:00 -0700 |
|---|---|---|
| committer | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2013-08-05 08:16:00 -0700 |
| commit | 5b28bf1e5112c21232283e571b48483b659e70a3 (patch) | |
| tree | 112a14fa0e6629024505a8ee1665e3167920ce03 /app | |
| parent | d602d5b1b05036788c67c13510c34725c68116ea (diff) | |
| parent | 171ce67a0c36145ebb123f0df0ef15681272a159 (diff) | |
| download | gitlab-ce-5b28bf1e5112c21232283e571b48483b659e70a3.tar.gz | |
Merge pull request #4705 from DarthNerdus/new-user-email
Add appropriate article to new user email.
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/notify/new_user_email.html.haml | 2 | ||||
| -rw-r--r-- | app/views/notify/new_user_email.text.erb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/notify/new_user_email.html.haml b/app/views/notify/new_user_email.html.haml index fc2c02ef827..09518cd3c7f 100644 --- a/app/views/notify/new_user_email.html.haml +++ b/app/views/notify/new_user_email.html.haml @@ -4,7 +4,7 @@ - if Gitlab.config.gitlab.signup_enabled Your account has been created successfully. - else - The Administrator created an account for you. Now you are a member of company GitLab application. + The Administrator created an account for you. Now you are a member of the company GitLab application. %p login.......................................... %code= @user['email'] diff --git a/app/views/notify/new_user_email.text.erb b/app/views/notify/new_user_email.text.erb index 70fe0e0736a..50ed595b38a 100644 --- a/app/views/notify/new_user_email.text.erb +++ b/app/views/notify/new_user_email.text.erb @@ -1,6 +1,6 @@ Hi <%= @user.name %>! -The Administrator created an account for you. Now you are a member of company GitLab application. +The Administrator created an account for you. Now you are a member of the company GitLab application. login.................. <%= @user.email %> <% if @user.created_by_id %> |