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
Léo-Paul Géneau
gitlab-ce
Commits
cf3f22cc
Commit
cf3f22cc
authored
11 years ago
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Corrent link for MR diff note in email
parent
22ec3fa1
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
15 additions
and
11 deletions
+15
-11
app/views/notify/note_merge_request_email.html.haml
app/views/notify/note_merge_request_email.html.haml
+15
-11
No files found.
app/views/notify/note_merge_request_email.html.haml
View file @
cf3f22cc
%td
.content
{
align:
"left"
,
style:
"font-family: Helvetica, Arial, sans-serif; padding: 20px 0 0;"
,
valign:
"top"
,
width:
"600"
}
%table
{
border:
"0"
,
cellpadding:
"0"
,
cellspacing:
"0"
,
style:
"color: #717171; font: normal 11px Helvetica, Arial, sans-serif; margin: 0; padding: 0;"
,
width:
"600"
}
%tr
%td
{
style:
"font-size: 1px; line-height: 1px;"
,
width:
"21"
}
%td
{
width:
"21"
}
%td
{
align:
"left"
,
style:
"padding: 20px 0 0;"
}
%h2
{
style:
"color:#646464; font-weight: bold; margin: 0; padding: 0; line-height: 26px; font-size: 18px; font-family: Helvetica, Arial, sans-serif; "
}
=
"New comment for Merge Request !
#{
@merge_request
.
id
}
"
=
link_to_gfm
truncate
(
@merge_request
.
title
,
length:
16
),
project_merge_request_url
(
@merge_request
.
project
,
@merge_request
,
anchor:
"note_
#{
@note
.
id
}
"
)
%td
{
style:
"font-size: 1px; line-height: 1px;"
,
width:
"21"
}
%h2
{
style:
"color:#646464; font-weight: normal;"
}
-
if
@note
.
for_diff_line?
=
link_to
"New comment on diff"
,
diffs_project_merge_request_url
(
@merge_request
.
project
,
@merge_request
,
anchor:
"note_
#{
@note
.
id
}
"
)
-
else
=
link_to
"New comment"
,
project_merge_request_url
(
@merge_request
.
project
,
@merge_request
,
anchor:
"note_
#{
@note
.
id
}
"
)
for Merge Request ##{@merge_request.id}
%cite
"
#{
truncate
(
@merge_request
.
title
,
length:
20
)
}
"
%td
{
width:
"21"
}
%tr
%td
{
style:
"font-size: 1px; line-height: 1px;"
,
width:
"21"
}
%td
{
style:
"padding: 15px 0 15px;"
,
valign:
"top"
}
%p
{
style:
"color:#767676; font-weight: normal; margin: 0; padding: 0; line-height: 20px; font-size: 12px;font-family: Helvetica, Arial, sans-serif; "
}
%
a
{
href:
"#"
,
style:
"color: #0eb6ce; text-decoration: none;"
}
#{
@note
.
author_name
}
%td
{
width:
"21"
}
%td
%p
%
strong
#{
@note
.
author_name
}
left next message:
%br
%table
{
border:
"0"
,
cellpadding:
"0"
,
cellspacing:
"0"
,
width:
"558"
}
%tr
%td
{
valign:
"top"
}
%div
{
style:
"background:#f5f5f5; padding:20px;border:1px solid #ddd"
}
%div
{
style:
"background:#f5f5f5; padding:
10px
20px;border:1px solid #ddd"
}
=
markdown
(
@note
.
note
)
%td
{
style:
"font-size: 1px; line-height: 1px;"
,
width:
"21"
}
%td
{
width:
"21"
}
This diff is collapsed.
Click to expand it.
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