Commit ff24f0e4 authored by Kushal Pandya's avatar Kushal Pandya

HAMLLint: Fix `RubyComments` offences

parent 41f130ea
.file-content.image_file .file-content.image_file
- if blob.svg? - if blob.svg?
- if blob.size_within_svg_limits? - if blob.size_within_svg_limits?
- # We need to scrub SVG but we cannot do so in the RawController: it would -# We need to scrub SVG but we cannot do so in the RawController: it would
- # be wrong/strange if RawController modified the data. -# be wrong/strange if RawController modified the data.
- blob.load_all_data!(@repository) - blob.load_all_data!(@repository)
- blob = sanitize_svg(blob) - blob = sanitize_svg(blob)
%img{ src: "data:#{blob.mime_type};base64,#{Base64.encode64(blob.data)}", alt: "#{blob.name}" } %img{ src: "data:#{blob.mime_type};base64,#{Base64.encode64(blob.data)}", alt: "#{blob.name}" }
......
.diff-content.diff-wrap-lines .diff-content.diff-wrap-lines
- # Skip all non non-supported blobs -# Skip all non non-supported blobs
- return unless blob.respond_to?(:text?) - return unless blob.respond_to?(:text?)
- if diff_file.too_large? - if diff_file.too_large?
.nothing-here-block This diff could not be displayed because it is too large. .nothing-here-block This diff could not be displayed because it is too large.
......
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
#commits.commits.tab-pane.active #commits.commits.tab-pane.active
= render "projects/merge_requests/show/commits" = render "projects/merge_requests/show/commits"
#diffs.diffs.tab-pane #diffs.diffs.tab-pane
- # This tab is always loaded via AJAX -# This tab is always loaded via AJAX
- if @pipelines.any? - if @pipelines.any?
#pipelines.pipelines.tab-pane #pipelines.pipelines.tab-pane
= render "projects/merge_requests/show/pipelines" = render "projects/merge_requests/show/pipelines"
......
...@@ -92,11 +92,11 @@ ...@@ -92,11 +92,11 @@
= render "projects/merge_requests/discussion" = render "projects/merge_requests/discussion"
#commits.commits.tab-pane #commits.commits.tab-pane
- # This tab is always loaded via AJAX -# This tab is always loaded via AJAX
#pipelines.pipelines.tab-pane #pipelines.pipelines.tab-pane
- # This tab is always loaded via AJAX -# This tab is always loaded via AJAX
#diffs.diffs.tab-pane #diffs.diffs.tab-pane
- # This tab is always loaded via AJAX -# This tab is always loaded via AJAX
.mr-loading-status .mr-loading-status
= spinner = spinner
......
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
%span.ci-coverage %span.ci-coverage
- elsif @merge_request.has_ci? - elsif @merge_request.has_ci?
- # Compatibility with old CI integrations (ex jenkins) when you request status from CI server via AJAX -# Compatibility with old CI integrations (ex jenkins) when you request status from CI server via AJAX
- # TODO, remove in later versions when services like Jenkins will set CI status via Commit status API -# TODO, remove in later versions when services like Jenkins will set CI status via Commit status API
.mr-widget-heading .mr-widget-heading
- %w[success skipped canceled failed running pending].each do |status| - %w[success skipped canceled failed running pending].each do |status|
.ci_widget{ class: "ci-#{status} ci-status-icon-#{status}", style: "display:none" } .ci_widget{ class: "ci-#{status} ci-status-icon-#{status}", style: "display:none" }
......
...@@ -110,16 +110,16 @@ ...@@ -110,16 +110,16 @@
= spinner = spinner
#groups.tab-pane #groups.tab-pane
- # This tab is always loaded via AJAX -# This tab is always loaded via AJAX
#contributed.tab-pane #contributed.tab-pane
- # This tab is always loaded via AJAX -# This tab is always loaded via AJAX
#projects.tab-pane #projects.tab-pane
- # This tab is always loaded via AJAX -# This tab is always loaded via AJAX
#snippets.tab-pane #snippets.tab-pane
- # This tab is always loaded via AJAX -# This tab is always loaded via AJAX
.loading-status .loading-status
= spinner = spinner
......
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