Commit 5b28bf1e authored by Jacob Vosmaer's avatar Jacob Vosmaer

Merge pull request #4705 from DarthNerdus/new-user-email

Add appropriate article to new user email.
parents d602d5b1 171ce67a
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
- if Gitlab.config.gitlab.signup_enabled - if Gitlab.config.gitlab.signup_enabled
Your account has been created successfully. Your account has been created successfully.
- else - 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 %p
login.......................................... login..........................................
%code= @user['email'] %code= @user['email']
......
Hi <%= @user.name %>! 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 %> login.................. <%= @user.email %>
<% if @user.created_by_id %> <% if @user.created_by_id %>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment