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
c6819279
Commit
c6819279
authored
Jan 16, 2017
by
Bryce Johnson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Shush haml_lint.
parent
428a67fe
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
8 deletions
+8
-8
app/views/notify/approved_merge_request_email.html.haml
app/views/notify/approved_merge_request_email.html.haml
+3
-3
app/views/notify/unapproved_merge_request_email.html.haml
app/views/notify/unapproved_merge_request_email.html.haml
+3
-3
app/views/projects/merge_requests/widget/open/_approvals_body.html.haml
...ects/merge_requests/widget/open/_approvals_body.html.haml
+1
-1
app/views/projects/merge_requests/widget/open/_approvals_footer.html.haml
...ts/merge_requests/widget/open/_approvals_footer.html.haml
+1
-1
No files found.
app/views/notify/approved_merge_request_email.html.haml
View file @
c6819279
...
...
@@ -73,11 +73,11 @@
%td
{
style:
"font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;line-height:1.4;text-align:center;padding:0 15px;border:1px solid #ededed;border-radius:3px;overflow:hidden;"
}
%table
.img
{
border:
"0"
,
cellpadding:
"0"
,
cellspacing:
"0"
,
style:
"border-collapse:collapse;width:100%;"
}
%tbody
%tr
{
style:
'width:100%;'
}
%tr
{
style:
'width:100%;'
}
%td
{
style:
"font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:15px;line-height:1.4;color:#8c8c8c;font-weight:300;padding:14px 0;margin:0;text-align:center;"
}
%span
{
style:
"font-weight: bold;color:#333333;"
}
Merge request
%span
{
style:
"font-weight: bold;color:#333333;"
}
Merge request
%a
{
href:
merge_request_url
(
@merge_request
),
style:
"font-weight: bold;color:#3777b0;text-decoration:none"
}
#{
@merge_request
.
to_reference
}
%span
was approved by
%span
was approved by
%img
.avatar
{
height:
"24"
,
src:
avatar_icon
(
@approved_by
,
24
),
style:
"border-radius:12px;margin:-7px 0 -7px 3px;"
,
width:
"24"
,
alt:
"Avatar"
}
/
%a
.muted
{
href:
user_url
(
@approved_by
),
style:
"color:#333333;text-decoration:none;"
}
=
@approved_by
.
name
...
...
app/views/notify/unapproved_merge_request_email.html.haml
View file @
c6819279
...
...
@@ -73,10 +73,10 @@
%td
{
style:
"font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;line-height:1.4;text-align:center;padding:0 15px;border:1px solid #ededed;border-radius:3px;overflow:hidden;"
}
%table
.img
{
border:
"0"
,
cellpadding:
"0"
,
cellspacing:
"0"
,
style:
"border-collapse:collapse;width:100%;"
}
%tbody
%tr
{
style:
'width:100%;'
}
%tr
{
style:
'width:100%;'
}
%td
{
style:
"font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:15px;line-height:1.4;color:#8c8c8c;font-weight:300;padding:14px 0;margin:0;text-align:center;"
}
%span
{
style:
"font-weight: bold;color:#333333;"
}
Merge request
%a
{
href:
merge_request_url
(
@merge_request
),
style:
"font-weight: bold;color:#3777b0;text-decoration:none"
}
#{
@merge_request
.
to_reference
}
%span
{
style:
"font-weight: bold;color:#333333;"
}
Merge request
%a
{
href:
merge_request_url
(
@merge_request
),
style:
"font-weight: bold;color:#3777b0;text-decoration:none"
}
#{
@merge_request
.
to_reference
}
%span
was unapproved by
%img
.avatar
{
height:
"24"
,
src:
avatar_icon
(
@unapproved_by
,
24
),
style:
"border-radius:12px;margin:-7px 0 -7px 3px;"
,
width:
"24"
,
alt:
"Avatar"
}
/
%a
.muted
{
href:
user_url
(
@unapproved_by
),
style:
"color:#333333;text-decoration:none;"
}
...
...
app/views/projects/merge_requests/widget/open/_approvals_body.html.haml
View file @
c6819279
%approvals-body
{
':user-can-approve'
=>
'approvals.user_can_approve'
,
':user-has-approved'
=>
'approvals.user_has_approved'
,
':approved-by'
=>
'approvals.approved_by'
,
':approvals-left'
:'approvals.approvals_left'
,
':suggested-approvers'
=>
'approvals.suggested_approvers'
}
%approvals-body
{
':user-can-approve'
=>
'approvals.user_can_approve'
,
':user-has-approved'
=>
'approvals.user_has_approved'
,
':approved-by'
=>
'approvals.approved_by'
,
':approvals-left'
:'approvals.approvals_left'
,
':suggested-approvers'
=>
'approvals.suggested_approvers'
}
app/views/projects/merge_requests/widget/open/_approvals_footer.html.haml
View file @
c6819279
%approvals-footer
{
'pending-avatar-svg'
=>
custom_icon
(
'icon_dotted_circle'
),
'checkmark-svg'
=>
custom_icon
(
'icon_checkmark'
),
':user-can-approve'
=>
'approvals.user_can_approve'
,
':user-has-approved'
=>
'approvals.user_has_approved'
,
':approved-by'
=>
'approvals.approved_by'
,
':approvals-left'
:'approvals.approvals_left'
}
%approvals-footer
{
'pending-avatar-svg'
=>
custom_icon
(
'icon_dotted_circle'
),
'checkmark-svg'
=>
custom_icon
(
'icon_checkmark'
),
':user-can-approve'
=>
'approvals.user_can_approve'
,
':user-has-approved'
=>
'approvals.user_has_approved'
,
':approved-by'
=>
'approvals.approved_by'
,
':approvals-left'
:'approvals.approvals_left'
}
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