Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
5b28bf1e
Commit
5b28bf1e
authored
Aug 05, 2013
by
Jacob Vosmaer
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #4705 from DarthNerdus/new-user-email
Add appropriate article to new user email.
parents
d602d5b1
171ce67a
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
app/views/notify/new_user_email.html.haml
app/views/notify/new_user_email.html.haml
+1
-1
app/views/notify/new_user_email.text.erb
app/views/notify/new_user_email.text.erb
+1
-1
No files found.
app/views/notify/new_user_email.html.haml
View file @
5b28bf1e
...
@@ -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'
]
...
...
app/views/notify/new_user_email.text.erb
View file @
5b28bf1e
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
%>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment