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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
6bca0b43
Commit
6bca0b43
authored
Nov 23, 2014
by
Sacred Seven
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
RTL Support in Emails
parent
e0bee390
Changes
15
Show whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
61 additions
and
15 deletions
+61
-15
app/views/notify/_note_message.html.haml
app/views/notify/_note_message.html.haml
+8
-0
app/views/notify/_reassigned_issuable_email.html.haml
app/views/notify/_reassigned_issuable_email.html.haml
+2
-2
app/views/notify/closed_issue_email.html.haml
app/views/notify/closed_issue_email.html.haml
+2
-1
app/views/notify/closed_merge_request_email.html.haml
app/views/notify/closed_merge_request_email.html.haml
+2
-1
app/views/notify/group_access_granted_email.html.haml
app/views/notify/group_access_granted_email.html.haml
+1
-1
app/views/notify/issue_status_changed_email.html.haml
app/views/notify/issue_status_changed_email.html.haml
+2
-1
app/views/notify/merge_request_status_email.html.haml
app/views/notify/merge_request_status_email.html.haml
+2
-1
app/views/notify/new_email_email.html.haml
app/views/notify/new_email_email.html.haml
+3
-1
app/views/notify/new_issue_email.html.haml
app/views/notify/new_issue_email.html.haml
+10
-1
app/views/notify/new_merge_request_email.html.haml
app/views/notify/new_merge_request_email.html.haml
+12
-1
app/views/notify/new_ssh_key_email.html.haml
app/views/notify/new_ssh_key_email.html.haml
+4
-2
app/views/notify/new_user_email.html.haml
app/views/notify/new_user_email.html.haml
+3
-1
app/views/notify/project_access_granted_email.html.haml
app/views/notify/project_access_granted_email.html.haml
+1
-1
app/views/notify/project_was_moved_email.html.haml
app/views/notify/project_was_moved_email.html.haml
+1
-1
app/views/notify/repository_push_email.html.haml
app/views/notify/repository_push_email.html.haml
+8
-0
No files found.
app/views/notify/_note_message.html.haml
View file @
6bca0b43
%div
%div
=
markdown
(
@note
.
note
)
=
markdown
(
@note
.
note
)
:javascript
document
.
addEventListener
(
"
DOMContentLoaded
"
,
function
(
event
)
{
var
elements
=
document
.
getElementsByTagName
(
"
*
"
);
for
(
var
i
=
0
;
i
<
elements
.
length
;
++
i
)
{
elements
[
i
].
setAttribute
(
"
dir
"
,
"
auto
"
);
}
});
app/views/notify/_reassigned_issuable_email.html.haml
View file @
6bca0b43
...
@@ -2,9 +2,9 @@
...
@@ -2,9 +2,9 @@
Assignee changed
Assignee changed
-
if
@previous_assignee
-
if
@previous_assignee
from
from
%strong
#{
@previous_assignee
.
name
}
%strong
{
dir: :auto
}
#{
@previous_assignee
.
name
}
to
to
-
if
issuable
.
assignee_id
-
if
issuable
.
assignee_id
%strong
#{
issuable
.
assignee_name
}
%strong
{
dir: :auto
}
#{
issuable
.
assignee_name
}
-
else
-
else
%strong
Unassigned
%strong
Unassigned
app/views/notify/closed_issue_email.html.haml
View file @
6bca0b43
%p
%p
=
"Issue was closed by
#{
@updated_by
.
name
}
"
=
"Issue was closed by "
%span
{
dir: :auto
}=
@updated_by
.
name
app/views/notify/closed_merge_request_email.html.haml
View file @
6bca0b43
%p
%p
=
"Merge Request #
#{
@merge_request
.
iid
}
was closed by
#{
@updated_by
.
name
}
"
=
"Merge Request #
#{
@merge_request
.
iid
}
was closed by "
%span
{
dir: :auto
}=
@updated_by
.
name
app/views/notify/group_access_granted_email.html.haml
View file @
6bca0b43
%p
%p
=
"You have been granted
#{
@membership
.
human_access
}
access to group"
=
"You have been granted
#{
@membership
.
human_access
}
access to group"
=
link_to
group_url
(
@group
)
do
=
link_to
group_url
(
@group
)
do
=
@group
.
name
%span
{
dir: :auto
}
=
@group
.
name
app/views/notify/issue_status_changed_email.html.haml
View file @
6bca0b43
%p
%p
=
"Issue was
#{
@issue_status
}
by
#{
@updated_by
.
name
}
"
=
"Issue was
#{
@issue_status
}
by "
%span
{
dir: :auto
}=
@updated_by
.
name
app/views/notify/merge_request_status_email.html.haml
View file @
6bca0b43
%p
%p
=
"Merge Request #
#{
@merge_request
.
iid
}
was
#{
@mr_status
}
by
#{
@updated_by
.
name
}
"
=
"Merge Request #
#{
@merge_request
.
iid
}
was
#{
@mr_status
}
by "
%span
{
dir: :auto
}=
@updated_by
.
name
app/views/notify/new_email_email.html.haml
View file @
6bca0b43
%p
%p
Hi
#{
@user
.
name
}
!
Hi
%span
{
dir: :auto
}=
@user
.
name
!
%p
%p
A new email was added to your account:
A new email was added to your account:
%p
%p
...
...
app/views/notify/new_issue_email.html.haml
View file @
6bca0b43
...
@@ -3,4 +3,13 @@
...
@@ -3,4 +3,13 @@
-
if
@issue
.
assignee_id
.
present?
-
if
@issue
.
assignee_id
.
present?
%p
%p
Assignee:
#{
@issue
.
assignee_name
}
Assignee:
%span
=
@issue
.
assignee_name
:javascript
document
.
addEventListener
(
"
DOMContentLoaded
"
,
function
(
event
)
{
var
elements
=
document
.
getElementsByTagName
(
"
*
"
);
for
(
var
i
=
0
;
i
<
elements
.
length
;
++
i
)
{
elements
[
i
].
setAttribute
(
"
dir
"
,
"
auto
"
);
}
});
app/views/notify/new_merge_request_email.html.haml
View file @
6bca0b43
...
@@ -3,7 +3,18 @@
...
@@ -3,7 +3,18 @@
-
if
@merge_request
.
assignee_id
.
present?
-
if
@merge_request
.
assignee_id
.
present?
%p
%p
Assignee:
#{
@merge_request
.
author_name
}
→
#{
@merge_request
.
assignee_name
}
Assignee:
%span
=
@merge_request
.
author_name
→
%span
=
@merge_request
.
assignee_name
-
if
@merge_request
.
description
-
if
@merge_request
.
description
=
markdown
(
@merge_request
.
description
)
=
markdown
(
@merge_request
.
description
)
:javascript
document
.
addEventListener
(
"
DOMContentLoaded
"
,
function
(
event
)
{
var
elements
=
document
.
getElementsByTagName
(
"
*
"
);
for
(
var
i
=
0
;
i
<
elements
.
length
;
++
i
)
{
elements
[
i
].
setAttribute
(
"
dir
"
,
"
auto
"
);
}
});
app/views/notify/new_ssh_key_email.html.haml
View file @
6bca0b43
%p
%p
Hi
#{
@user
.
name
}
!
Hi
%span
{
dir: :auto
}=
@user
.
name
!
%p
%p
A new public key was added to your account:
A new public key was added to your account:
%p
%p
title:
title:
%code
=
@key
.
title
%code
{
dir: :auto
}
=
@key
.
title
%p
%p
If this key was added in error, you can remove it here:
If this key was added in error, you can remove it here:
=
link_to
"SSH Keys"
,
profile_keys_url
=
link_to
"SSH Keys"
,
profile_keys_url
app/views/notify/new_user_email.html.haml
View file @
6bca0b43
%p
%p
Hi
#{
@user
[
'name'
]
}
!
Hi
%span
{
dir: :auto
}=
@user
[
'name'
]
!
%p
%p
-
if
Gitlab
.
config
.
gitlab
.
signup_enabled
-
if
Gitlab
.
config
.
gitlab
.
signup_enabled
Your account has been created successfully.
Your account has been created successfully.
...
...
app/views/notify/project_access_granted_email.html.haml
View file @
6bca0b43
...
@@ -2,4 +2,4 @@
...
@@ -2,4 +2,4 @@
=
"You have been granted
#{
@project_member
.
human_access
}
access to project"
=
"You have been granted
#{
@project_member
.
human_access
}
access to project"
%p
%p
=
link_to
project_url
(
@project
)
do
=
link_to
project_url
(
@project
)
do
=
@project
.
name_with_namespace
%span
{
dir: :auto
}
=
@project
.
name_with_namespace
app/views/notify/project_was_moved_email.html.haml
View file @
6bca0b43
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
%p
%p
The project is now located under
The project is now located under
=
link_to
project_url
(
@project
)
do
=
link_to
project_url
(
@project
)
do
=
@project
.
name_with_namespace
%span
{
dir: :auto
}
=
@project
.
name_with_namespace
%p
%p
To update the remote url in your local repository run (for ssh):
To update the remote url in your local repository run (for ssh):
%p
{
style:
"background:#f5f5f5; padding:10px; border:1px solid #ddd"
}
%p
{
style:
"background:#f5f5f5; padding:10px; border:1px solid #ddd"
}
...
...
app/views/notify/repository_push_email.html.haml
View file @
6bca0b43
...
@@ -26,3 +26,11 @@
...
@@ -26,3 +26,11 @@
-
if
@compare
.
timeout
-
if
@compare
.
timeout
%h5
Huge diff. To prevent performance issues changes are hidden
%h5
Huge diff. To prevent performance issues changes are hidden
:javascript
document
.
addEventListener
(
"
DOMContentLoaded
"
,
function
(
event
)
{
var
elements
=
document
.
getElementsByTagName
(
"
*
"
);
for
(
var
i
=
0
;
i
<
elements
.
length
;
++
i
)
{
elements
[
i
].
setAttribute
(
"
dir
"
,
"
auto
"
);
}
});
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