Commit 7ee6c81c authored by Rémy Coutable's avatar Rémy Coutable

Fix UnnecessaryInterpolation HAML linter

Signed-off-by: default avatarRémy Coutable <remy@rymai.me>
parent b192f3f6
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
= node.primary ? icon('star fw') : icon('globe fw') = node.primary ? icon('star fw') : icon('globe fw')
%strong= node.url %strong= node.url
%p %p
%span.help-block #{node.primary ? 'Primary node' : 'Secondary node'} %span.help-block= node.primary ? 'Primary node' : 'Secondary node'
.pull-right .pull-right
- if Gitlab::Geo.license_allows? - if Gitlab::Geo.license_allows?
......
...@@ -4,7 +4,7 @@ ...@@ -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' = link_to icon('question-circle'), help_page_path("user/admin_area/settings/continuous_integration", anchor: "shared-runners-build-minutes-quota"), target: '_blank'
%p.light %p.light
Monthly build minutes usage across shared Runners for the Monthly build minutes usage across shared Runners for the
%strong #{@group.name} %strong= @group.name
group group
.pipeline-quota.container-fluid .pipeline-quota.container-fluid
......
...@@ -11,5 +11,5 @@ ...@@ -11,5 +11,5 @@
.cred .cred
%i.fa.fa-warning %i.fa.fa-warning
Config for LDAP server Config for LDAP server
%code #{ldap_group_link.provider} %code= ldap_group_link.provider
is not present in GitLab is not present in GitLab
...@@ -77,7 +77,7 @@ ...@@ -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;" } %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" } %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 %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 %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" }/ %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;" } %a.muted{ href: user_url(@approved_by), style: "color:#333333;text-decoration:none;" }
......
...@@ -77,7 +77,7 @@ ...@@ -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;" } %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" } %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 %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 %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" }/ %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;" } %a.muted{ href: user_url(@unapproved_by), style: "color:#333333;text-decoration:none;" }
......
...@@ -16,8 +16,7 @@ ...@@ -16,8 +16,7 @@
- else - else
(removed) (removed)
%td %td
%span %span= raw human_text(event.details)
#{raw human_text(event.details)} %td= event.details[:target_details]
%td #{event.details[:target_details]} %td= event.created_at
%td #{event.created_at}
= paginate events, theme: "gitlab" = paginate events, theme: "gitlab"
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment