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
7ee6c81c
Commit
7ee6c81c
authored
Jan 26, 2017
by
Rémy Coutable
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix UnnecessaryInterpolation HAML linter
Signed-off-by:
Rémy Coutable
<
remy@rymai.me
>
parent
b192f3f6
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
8 additions
and
9 deletions
+8
-9
app/views/admin/geo_nodes/index.html.haml
app/views/admin/geo_nodes/index.html.haml
+1
-1
app/views/groups/pipeline_quota/index.html.haml
app/views/groups/pipeline_quota/index.html.haml
+1
-1
app/views/ldap_group_links/_ldap_group_link.html.haml
app/views/ldap_group_links/_ldap_group_link.html.haml
+1
-1
app/views/notify/approved_merge_request_email.html.haml
app/views/notify/approved_merge_request_email.html.haml
+1
-1
app/views/notify/unapproved_merge_request_email.html.haml
app/views/notify/unapproved_merge_request_email.html.haml
+1
-1
app/views/shared/audit_events/_event_table.html.haml
app/views/shared/audit_events/_event_table.html.haml
+3
-4
No files found.
app/views/admin/geo_nodes/index.html.haml
View file @
7ee6c81c
...
...
@@ -22,7 +22,7 @@
=
node
.
primary
?
icon
(
'star fw'
)
:
icon
(
'globe fw'
)
%strong
=
node
.
url
%p
%span
.help-block
#{
node
.
primary
?
'Primary node'
:
'Secondary node'
}
%span
.help-block
=
node
.
primary
?
'Primary node'
:
'Secondary node'
.pull-right
-
if
Gitlab
::
Geo
.
license_allows?
...
...
app/views/groups/pipeline_quota/index.html.haml
View file @
7ee6c81c
...
...
@@ -4,7 +4,7 @@
=
link_to
icon
(
'question-circle'
),
help_page_path
(
"user/admin_area/settings/continuous_integration"
,
anchor:
"shared-runners-build-minutes-quota"
),
target:
'_blank'
%p
.light
Monthly build minutes usage across shared Runners for the
%strong
#{
@group
.
name
}
%strong
=
@group
.
name
group
.pipeline-quota.container-fluid
...
...
app/views/ldap_group_links/_ldap_group_link.html.haml
View file @
7ee6c81c
...
...
@@ -11,5 +11,5 @@
.cred
%i
.fa.fa-warning
Config for LDAP server
%code
#{
ldap_group_link
.
provider
}
%code
=
ldap_group_link
.
provider
is not present in GitLab
app/views/notify/approved_merge_request_email.html.haml
View file @
7ee6c81c
...
...
@@ -77,7 +77,7 @@
%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;"
}
%img
{
src:
image_url
(
'mailers/approval/icon-merge-request-gray.gif'
),
style:
"height:18px;width:18px;margin-bottom:-4px;"
,
alt:
"Merge request icon"
}
%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
}
%a
{
href:
merge_request_url
(
@merge_request
),
style:
"font-weight: bold;color:#3777b0;text-decoration:none"
}
=
@merge_request
.
to_reference
%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;"
}
...
...
app/views/notify/unapproved_merge_request_email.html.haml
View file @
7ee6c81c
...
...
@@ -77,7 +77,7 @@
%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;"
}
%img
{
src:
image_url
(
'mailers/approval/icon-merge-request-gray.gif'
),
style:
"height:18px;width:18px;margin-bottom:-4px;"
,
alt:
"Merge request icon"
}
%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
}
%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/shared/audit_events/_event_table.html.haml
View file @
7ee6c81c
...
...
@@ -16,8 +16,7 @@
-
else
(removed)
%td
%span
#{
raw
human_text
(
event
.
details
)
}
%td
#{
event
.
details
[
:target_details
]
}
%td
#{
event
.
created_at
}
%span
=
raw
human_text
(
event
.
details
)
%td
=
event
.
details
[
:target_details
]
%td
=
event
.
created_at
=
paginate
events
,
theme:
"gitlab"
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