Merge branch '22072-enable-haml-linters-phase-2' into 'master'

Enable HAML-LINT linters phase 2 Closes #22072 See merge request !8566
2017-01-25 12:51:53 +00:00 · 2017-01-25 12:51:53 +00:00 · 84ae12c9ed
parent f4c0ed5ee2 08c57ec94a
commit 84ae12c9ed
71 changed files with 108 additions and 108 deletions
--- a/.haml-lint.yml
+++ b/.haml-lint.yml
@ -46,7 +46,7 @@ linters:
    max: 80

  MultilinePipe:
-    enabled: false
+    enabled: true

  MultilineScript:
    enabled: true
@ -77,7 +77,7 @@ linters:
      - Style/WhileUntilModifier

  RubyComments:
-    enabled: false
+    enabled: true

  SpaceBeforeScript:
    enabled: true
@ -97,7 +97,7 @@ linters:
    enabled: true

  UnnecessaryInterpolation:
-    enabled: false
+    enabled: true

  UnnecessaryStringOutput:
-    enabled: false
+    enabled: true
--- a/app/views/admin/broadcast_messages/_form.html.haml
+++ b/app/views/admin/broadcast_messages/_form.html.haml
@ -4,7 +4,7 @@
    - if @broadcast_message.message.present?
      = render_broadcast_message(@broadcast_message)
    - else
-      = "Your message here"
+      Your message here

 = form_for [:admin, @broadcast_message], html: { class: 'broadcast-message-form form-horizontal js-quick-submit js-requires-input'} do |f|
  = form_errors(@broadcast_message)
--- a/app/views/admin/identities/_identity.html.haml
+++ b/app/views/admin/identities/_identity.html.haml
@ -1,6 +1,6 @@
 %tr
  %td
-    = "#{Gitlab::OAuth::Provider.label_for(identity.provider)} (#{identity.provider})"
+    #{Gitlab::OAuth::Provider.label_for(identity.provider)} (#{identity.provider})
  %td
    = identity.extern_uid
  %td
--- a/app/views/admin/runners/index.html.haml
+++ b/app/views/admin/runners/index.html.haml
@ -11,7 +11,7 @@
      that for future communication.
      %br
      Registration token is
-      %code{ id: 'runners-token' } #{current_application_settings.runners_registration_token}
+      %code#runners-token= current_application_settings.runners_registration_token

  .bs-callout.clearfix
    .pull-left
--- a/app/views/admin/runners/show.html.haml
+++ b/app/views/admin/runners/show.html.haml
@ -100,7 +100,7 @@
          %td.build-link
            - if project
              = link_to ci_status_path(build.pipeline) do
-                %strong #{build.pipeline.short_sha}
+                %strong= build.pipeline.short_sha

          %td.timestamp
            - if build.finished_at
--- a/app/views/admin/system_info/show.html.haml
+++ b/app/views/admin/system_info/show.html.haml
@ -10,7 +10,7 @@
        %h4 CPU
        .data
          - if @cpus
-            %h1= "#{@cpus.length} cores"
+            %h1 #{@cpus.length} cores
          - else
            = icon('warning', class: 'text-warning')
            Unable to collect CPU info
@ -19,7 +19,7 @@
        %h4 Memory
        .data
          - if @memory
-            %h1= "#{number_to_human_size(@memory.active_bytes)} / #{number_to_human_size(@memory.total_bytes)}"
+            %h1 #{number_to_human_size(@memory.active_bytes)} / #{number_to_human_size(@memory.total_bytes)}
          - else
            = icon('warning', class: 'text-warning')
            Unable to collect memory info
@ -28,6 +28,6 @@
        %h4 Disks
        .data
          - @disks.each do |disk|
-            %h1= "#{number_to_human_size(disk[:bytes_used])} / #{number_to_human_size(disk[:bytes_total])}"
-            %p= "#{disk[:disk_name]}"
-            %p= "#{disk[:mount_path]}"
+            %h1 #{number_to_human_size(disk[:bytes_used])} / #{number_to_human_size(disk[:bytes_total])}
+            %p= disk[:disk_name]
+            %p= disk[:mount_path]
--- a/app/views/admin/users/show.html.haml
+++ b/app/views/admin/users/show.html.haml
@ -186,6 +186,6 @@
            - if @user.solo_owned_groups.present?
              %p
                This user is currently an owner in these groups:
-                %strong #{@user.solo_owned_groups.map(&:name).join(', ')}
+                %strong= @user.solo_owned_groups.map(&:name).join(', ')
              %p
                You must transfer ownership or delete these groups before you can delete this user.
--- a/app/views/ci/lints/show.html.haml
+++ b/app/views/ci/lints/show.html.haml
@ -13,7 +13,7 @@
          .file-holder
            .file-title.clearfix
              Content of .gitlab-ci.yml
-            #ci-editor.ci-editor #{@content}
+            #ci-editor.ci-editor= @content
          = text_area_tag(:content, @content, class: 'hidden form-control span1', rows: 7, require: true)
      .col-sm-12
        .pull-left.prepend-top-10
--- a/app/views/discussions/_parallel_diff_discussion.html.haml
+++ b/app/views/discussions/_parallel_diff_discussion.html.haml
@ -6,7 +6,7 @@
      .content{ class: ('hide' unless discussion_left.expanded?) }
        = render "discussions/notes", discussion: discussion_left, line_type: 'old'
  - else
-    %td.notes_line.old= ""
+    %td.notes_line.old= ("")
    %td.notes_content.parallel.old
      .content

@ -16,6 +16,6 @@
      .content{ class: ('hide' unless discussion_right.expanded?) }
        = render "discussions/notes", discussion: discussion_right, line_type: 'new'
  - else
-    %td.notes_line.new= ""
+    %td.notes_line.new= ("")
    %td.notes_content.parallel.new
      .content
--- a/app/views/doorkeeper/authorizations/new.html.haml
+++ b/app/views/doorkeeper/authorizations/new.html.haml
@ -10,7 +10,7 @@
      %p
        = icon("exclamation-triangle fw")
        You are an admin, which means granting access to
-        %strong #{@pre_auth.client.name}
+        %strong= @pre_auth.client.name
        will allow them to interact with GitLab as an admin as well. Proceed with caution.

  - if @pre_auth.scopes
--- a/app/views/groups/group_members/index.html.haml
+++ b/app/views/groups/group_members/index.html.haml
@ -25,7 +25,7 @@
  .panel.panel-default
    .panel-heading
      Users with access to
-      %strong #{@group.name}
+      %strong= @group.name
      %span.badge= @members.total_count
    %ul.content-list
      = render partial: 'shared/members/member', collection: @members, as: :member
--- a/app/views/groups/issues.html.haml
+++ b/app/views/groups/issues.html.haml
@ -18,7 +18,7 @@

  .row-content-block.second-block
    Only issues from the
-    %strong #{@group.name}
+    %strong= @group.name
    group are listed here.
    - if current_user
      To see all issues you should visit #{link_to 'dashboard', issues_dashboard_path} page.
--- a/app/views/groups/merge_requests.html.haml
+++ b/app/views/groups/merge_requests.html.haml
@ -10,7 +10,7 @@

 .row-content-block.second-block
  Only merge requests from
-  %strong #{@group.name}
+  %strong= @group.name
  group are listed here.
  - if current_user
    To see all merge requests you should visit #{link_to 'dashboard', merge_requests_dashboard_path} page.
--- a/app/views/groups/milestones/index.html.haml
+++ b/app/views/groups/milestones/index.html.haml
@ -10,7 +10,7 @@

 .row-content-block
  Only milestones from
-  %strong #{@group.name}
+  %strong= @group.name
  group are listed here.

 .milestones
--- a/app/views/import/_githubish_status.html.haml
+++ b/app/views/import/_githubish_status.html.haml
@ -16,7 +16,7 @@
    %colgroup.import-jobs-status-col
    %thead
      %tr
-        %th= "From #{provider_title}"
+        %th From #{provider_title}
        %th To GitLab
        %th Status
    %tbody
--- a/app/views/import/fogbugz/new_user_map.html.haml
+++ b/app/views/import/fogbugz/new_user_map.html.haml
@ -37,7 +37,7 @@
      %tbody
        - @user_map.each do |id, user|
          %tr
-            %td= id
+            %td= (id)
            %td= text_field_tag "users[#{id}][name]", user[:name], class: 'form-control'
            %td= text_field_tag "users[#{id}][email]", user[:email], class: 'form-control'
            %td
--- a/app/views/import/fogbugz/status.html.haml
+++ b/app/views/import/fogbugz/status.html.haml
@ -50,7 +50,7 @@
          %td
            = repo.name
          %td.import-target
-            = "#{current_user.username}/#{repo.name}"
+            #{current_user.username}/#{repo.name}
          %td.import-actions.job-status
            = button_tag class: "btn btn-import js-add-to-import" do
              Import
--- a/app/views/import/google_code/status.html.haml
+++ b/app/views/import/google_code/status.html.haml
@ -55,7 +55,7 @@
          %td
            = link_to repo.name, "https://code.google.com/p/#{repo.name}", target: "_blank"
          %td.import-target
-            = "#{current_user.username}/#{repo.name}"
+            #{current_user.username}/#{repo.name}
          %td.import-actions.job-status
            = button_tag class: "btn btn-import js-add-to-import" do
              Import
--- a/app/views/notify/_reassigned_issuable_email.html.haml
+++ b/app/views/notify/_reassigned_issuable_email.html.haml
@ -2,9 +2,9 @@
  Assignee changed
  - if @previous_assignee
    from
-    %strong #{@previous_assignee.name}
+    %strong= @previous_assignee.name
  to
  - if issuable.assignee_id
-    %strong #{issuable.assignee_name}
+    %strong= issuable.assignee_name
  - else
    %strong Unassigned
--- a/app/views/notify/closed_issue_email.html.haml
+++ b/app/views/notify/closed_issue_email.html.haml
@ -1,2 +1,2 @@
 %p
-  = "Issue was closed by #{@updated_by.name}"
+  Issue was closed by #{@updated_by.name}
--- a/app/views/notify/closed_issue_email.text.haml
+++ b/app/views/notify/closed_issue_email.text.haml
@ -1,3 +1,3 @@
-= "Issue was closed by #{@updated_by.name}"
+Issue was closed by #{@updated_by.name}

 Issue ##{@issue.iid}: #{namespace_project_issue_url(@issue.project.namespace, @issue.project, @issue)}
--- a/app/views/notify/closed_merge_request_email.html.haml
+++ b/app/views/notify/closed_merge_request_email.html.haml
@ -1,2 +1,2 @@
 %p
-  = "Merge Request #{@merge_request.to_reference} was closed by #{@updated_by.name}"
+  Merge Request #{@merge_request.to_reference} was closed by #{@updated_by.name}
--- a/app/views/notify/closed_merge_request_email.text.haml
+++ b/app/views/notify/closed_merge_request_email.text.haml
@ -1,4 +1,4 @@
-= "Merge Request #{@merge_request.to_reference} was closed by #{@updated_by.name}"
+Merge Request #{@merge_request.to_reference} was closed by #{@updated_by.name}

 Merge Request url: #{namespace_project_merge_request_url(@merge_request.target_project.namespace, @merge_request.target_project, @merge_request)}

--- a/app/views/notify/issue_status_changed_email.html.haml
+++ b/app/views/notify/issue_status_changed_email.html.haml
@ -1,2 +1,2 @@
 %p
-  = "Issue was #{@issue_status} by #{@updated_by.name}"
+  Issue was #{@issue_status} by #{@updated_by.name}
--- a/app/views/notify/merge_request_status_email.html.haml
+++ b/app/views/notify/merge_request_status_email.html.haml
@ -1,2 +1,2 @@
 %p
-  = "Merge Request #{@merge_request.to_reference} was #{@mr_status} by #{@updated_by.name}"
+  Merge Request #{@merge_request.to_reference} was #{@mr_status} by #{@updated_by.name}
--- a/app/views/notify/merge_request_status_email.text.haml
+++ b/app/views/notify/merge_request_status_email.text.haml
@ -1,4 +1,4 @@
-= "Merge Request #{@merge_request.to_reference} was #{@mr_status} by #{@updated_by.name}"
+Merge Request #{@merge_request.to_reference} was #{@mr_status} by #{@updated_by.name}

 Merge Request url: #{namespace_project_merge_request_url(@merge_request.target_project.namespace, @merge_request.target_project, @merge_request)}

--- a/app/views/notify/merged_merge_request_email.html.haml
+++ b/app/views/notify/merged_merge_request_email.html.haml
@ -1,2 +1,2 @@
 %p
-  = "Merge Request #{@merge_request.to_reference} was merged"
+  Merge Request #{@merge_request.to_reference} was merged
--- a/app/views/notify/merged_merge_request_email.text.haml
+++ b/app/views/notify/merged_merge_request_email.text.haml
@ -1,4 +1,4 @@
-= "Merge Request #{@merge_request.to_reference} was merged"
+Merge Request #{@merge_request.to_reference} was merged

 Merge Request url: #{namespace_project_merge_request_url(@merge_request.target_project.namespace, @merge_request.target_project, @merge_request)}

--- a/app/views/notify/pipeline_failed_email.html.haml
+++ b/app/views/notify/pipeline_failed_email.html.haml
@ -139,7 +139,7 @@
                            had
                            = failed.size
                            failed
-                            = "#{'build'.pluralize(failed.size)}."
+                            #{'build'.pluralize(failed.size)}.
                        %tr.warning
                          %td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;border:1px solid #ededed;border-bottom:0;border-radius:3px 3px 0 0;overflow:hidden;background-color:#fdf4f6;color:#d22852;font-size:14px;line-height:1.4;text-align:center;padding:8px 15px;" }
                            Logs may contain sensitive data. Please consider before forwarding this email.
--- a/app/views/notify/pipeline_success_email.html.haml
+++ b/app/views/notify/pipeline_success_email.html.haml
@ -138,9 +138,9 @@
                            %a{ href: pipeline_url(@pipeline), style: "color:#3777b0;text-decoration:none;" }
                              = "\##{@pipeline.id}"
                            successfully completed
-                            = "#{build_count} #{'build'.pluralize(build_count)}"
+                            #{build_count} #{'build'.pluralize(build_count)}
                            in
-                            = "#{stage_count} #{'stage'.pluralize(stage_count)}."
+                            #{stage_count} #{'stage'.pluralize(stage_count)}.
        %tr.footer
          %td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;padding:25px 0;font-size:13px;line-height:1.6;color:#5c5c5c;" }
            %img{ alt: "GitLab", height: "33", src: image_url('mailers/ci_pipeline_notif_v1/gitlab-logo-full-horizontal.gif'), style: "display:block;margin:0 auto 1em;", width: "90" }/
--- a/app/views/notify/project_was_not_exported_email.text.haml
+++ b/app/views/notify/project_was_not_exported_email.text.haml
@ -1,6 +1,6 @@
-= "Project #{@project.name} couldn't be exported."
+Project #{@project.name} couldn't be exported.

-= "The errors we encountered were:"
+The errors we encountered were:

 - @errors.each do |error|
  #{error}
--- a/app/views/notify/repository_push_email.html.haml
+++ b/app/views/notify/repository_push_email.html.haml
@ -17,7 +17,7 @@
  %ul
    - @message.commits.each do |commit|
      %li
-        %strong #{link_to(commit.short_id, namespace_project_commit_url(@message.project_namespace, @message.project, commit))}
+        %strong= link_to(commit.short_id, namespace_project_commit_url(@message.project_namespace, @message.project, commit))
        %div
          %span by #{commit.author_name}
          %i at #{commit.committed_date.to_s(:iso8601)}
--- a/app/views/profiles/accounts/show.html.haml
+++ b/app/views/profiles/accounts/show.html.haml
@ -102,7 +102,7 @@
            = f.text_field :username, required: true, class: 'form-control'
        .help-block
          Current path:
-          = "#{root_url}#{current_user.username}"
+          #{root_url}#{current_user.username}
        .prepend-top-default
          = f.button class: "btn btn-warning", type: "submit" do
            = icon "spinner spin", class: "hidden loading-username"
@ -128,7 +128,7 @@
        - if @user.solo_owned_groups.present?
          %p
            Your account is currently an owner in these groups:
-            %strong #{@user.solo_owned_groups.map(&:name).join(', ')}
+            %strong= @user.solo_owned_groups.map(&:name).join(', ')
          %p
            You must transfer ownership or delete these groups before you can delete your account.
 .append-bottom-default
--- a/app/views/profiles/show.html.haml
+++ b/app/views/profiles/show.html.haml
@ -62,7 +62,7 @@
            %span.help-block
              Please click the link in the confirmation email before continuing. It was sent to
              = succeed "." do
-                %strong #{@user.unconfirmed_email}
+                %strong= @user.unconfirmed_email
              %p
              = link_to "Resend confirmation e-mail", user_confirmation_path(user: { email: @user.unconfirmed_email }), method: :post

--- a/app/views/projects/blob/_editor.html.haml
+++ b/app/views/projects/blob/_editor.html.haml
@ -34,7 +34,7 @@
        = select_tag :encoding, options_for_select([ "base64", "text" ], "text"), class: 'select2'

  .file-editor.code
-    %pre.js-edit-mode-pane#editor #{params[:content] || local_assigns[:blob_data]}
+    %pre.js-edit-mode-pane#editor= params[:content] || local_assigns[:blob_data]
    - if local_assigns[:path]
      .js-edit-mode-pane#preview.hide
        .center
--- a/app/views/projects/blob/_image.html.haml
+++ b/app/views/projects/blob/_image.html.haml
@ -1,8 +1,8 @@
 .file-content.image_file
  - if blob.svg?
    - if blob.size_within_svg_limits?
-      - # We need to scrub SVG but we cannot do so in the RawController: it would
-      - # be wrong/strange if RawController modified the data.
+      -# We need to scrub SVG but we cannot do so in the RawController: it would
+      -# be wrong/strange if RawController modified the data.
      - blob.load_all_data!(@repository)
      - blob = sanitize_svg(blob)
      %img{ src: "data:#{blob.mime_type};base64,#{Base64.encode64(blob.data)}", alt: "#{blob.name}" }
--- a/app/views/projects/blob/_upload.html.haml
+++ b/app/views/projects/blob/_upload.html.haml
@ -3,7 +3,7 @@
    .modal-content
      .modal-header
        %a.close{ href: "#", "data-dismiss" => "modal" } ×
-        %h3.page-title #{title}
+        %h3.page-title= title
      .modal-body
        = form_tag form_path, method: method, class: 'js-quick-submit js-upload-blob-form form-horizontal' do
          .dropzone
--- a/app/views/projects/ci/builds/_build.html.haml
+++ b/app/views/projects/ci/builds/_build.html.haml
@ -85,7 +85,7 @@
    - if build.finished_at
      %p.finished-at
        = icon("calendar")
-        %span #{time_ago_with_tooltip(build.finished_at)}
+        %span= time_ago_with_tooltip(build.finished_at)

  %td.coverage
    - if coverage && build.try(:coverage)
--- a/app/views/projects/commits/_commits.html.haml
+++ b/app/views/projects/commits/_commits.html.haml
@ -2,7 +2,7 @@
 - commits, hidden = limited_commits(@commits)

 - commits.chunk { |c| c.committed_date.in_time_zone.to_date }.each do |day, commits|
-  %li.commit-header= "#{day.strftime('%d %b, %Y')} #{pluralize(commits.count, 'commit')}"
+  %li.commit-header #{day.strftime('%d %b, %Y')} #{pluralize(commits.count, 'commit')}
  %li.commits-row
    %ul.content-list.commit-list.table-list.table-wide
      = render commits, project: project, ref: ref
--- a/app/views/projects/compare/show.html.haml
+++ b/app/views/projects/compare/show.html.haml
@ -16,9 +16,9 @@
          There isn't anything to compare.
        %p.slead
          - if params[:to] == params[:from]
-            %span.label-branch #{params[:from]}
+            %span.label-branch= params[:from]
            and
-            %span.label-branch #{params[:to]}
+            %span.label-branch= params[:to]
            are the same.
          - else
            You'll need to use different branch names to get a valid comparison.
--- a/app/views/projects/deployments/_deployment.html.haml
+++ b/app/views/projects/deployments/_deployment.html.haml
@ -1,6 +1,6 @@
 %tr.deployment
  %td
-    %strong= "##{deployment.iid}"
+    %strong ##{deployment.iid}

  %td
    = render 'projects/deployments/commit', deployment: deployment
@ -8,7 +8,7 @@
  %td.build-column
    - if deployment.deployable
      = link_to [@project.namespace.becomes(Namespace), @project, deployment.deployable], class: 'build-link' do
-        = "#{deployment.deployable.name} (##{deployment.deployable.id})"
+        #{deployment.deployable.name} (##{deployment.deployable.id})
      - if deployment.user
        by
        = user_avatar(user: deployment.user, size: 20)
--- a/app/views/projects/diffs/_content.html.haml
+++ b/app/views/projects/diffs/_content.html.haml
@ -1,5 +1,5 @@
 .diff-content.diff-wrap-lines
-  - # Skip all non non-supported blobs
+  -# Skip all non non-supported blobs
  - return unless blob.respond_to?(:text?)
  - if diff_file.too_large?
    .nothing-here-block This diff could not be displayed because it is too large.
--- a/app/views/projects/diffs/_file_header.html.haml
+++ b/app/views/projects/diffs/_file_header.html.haml
@ -25,4 +25,4 @@

  - if diff_file.mode_changed?
    %small
-      = "#{diff_file.a_mode} → #{diff_file.b_mode}"
+      #{diff_file.a_mode} → #{diff_file.b_mode}
--- a/app/views/projects/diffs/_image.html.haml
+++ b/app/views/projects/diffs/_image.html.haml
@ -9,7 +9,7 @@
    %span.wrap
      .frame{ class: image_diff_class(diff) }
        %img{ src: diff.deleted_file ? old_file_raw_path : file_raw_path, alt: diff.new_path }
-      %p.image-info= "#{number_to_human_size file.size}"
+      %p.image-info= number_to_human_size(file.size)
 - else
  .image
    .two-up.view
@ -18,7 +18,7 @@
          %a{ href: namespace_project_blob_path(@project.namespace, @project, tree_join(diff_file.old_ref, diff.old_path)) }
            %img{ src: old_file_raw_path, alt: diff.old_path }
        %p.image-info.hide
-          %span.meta-filesize= "#{number_to_human_size old_file.size}"
+          %span.meta-filesize= number_to_human_size(old_file.size)
          |
          %b W:
          %span.meta-width
@ -30,7 +30,7 @@
          %a{ href: namespace_project_blob_path(@project.namespace, @project, tree_join(diff_file.new_ref, diff.new_path)) }
            %img{ src: file_raw_path, alt: diff.new_path }
        %p.image-info.hide
-          %span.meta-filesize= "#{number_to_human_size file.size}"
+          %span.meta-filesize= number_to_human_size(file.size)
          |
          %b W:
          %span.meta-width
--- a/app/views/projects/diffs/_stats.html.haml
+++ b/app/views/projects/diffs/_stats.html.haml
@ -2,7 +2,7 @@
  .commit-stat-summary
    Showing
    = link_to '#', class: 'js-toggle-button' do
-      %strong #{pluralize(diff_files.size, "changed file")}
+      %strong= pluralize(diff_files.size, "changed file")
    with
    %strong.cgreen #{diff_files.sum(&:added_lines)} additions
    and
--- a/app/views/projects/forks/index.html.haml
+++ b/app/views/projects/forks/index.html.haml
@ -1,7 +1,7 @@
 .top-area
  .nav-text
    - full_count_title = "#{@public_forks_count} public and #{@private_forks_count} private"
-    = "#{pluralize(@total_forks_count, 'fork')}: #{full_count_title}"
+    #{pluralize(@total_forks_count, 'fork')}: #{full_count_title}

  .nav-controls
    = form_tag request.original_url, method: :get, class: 'project-filter-form', id: 'project-filter-form' do |f|
--- a/app/views/projects/generic_commit_statuses/_generic_commit_status.html.haml
+++ b/app/views/projects/generic_commit_statuses/_generic_commit_status.html.haml
@ -77,7 +77,7 @@
    - if generic_commit_status.finished_at
      %p.finished-at
        = icon("calendar")
-        %span #{time_ago_with_tooltip(generic_commit_status.finished_at)}
+        %span= time_ago_with_tooltip(generic_commit_status.finished_at)

  %td.coverage
    - if coverage && generic_commit_status.try(:coverage)
--- a/app/views/projects/graphs/commits.html.haml
+++ b/app/views/projects/graphs/commits.html.haml
@ -11,7 +11,7 @@

  %p.lead
    Commit statistics for
-    %strong #{@ref}
+    %strong= @ref
    #{@commits_graph.start_date.strftime('%b %d')} - #{@commits_graph.end_date.strftime('%b %d')}

  .row
@ -19,19 +19,19 @@
      %ul
        %li
          %p.lead
-            %strong #{@commits_graph.commits.size}
+            %strong= @commits_graph.commits.size
            commits during
-            %strong #{@commits_graph.duration}
+            %strong= @commits_graph.duration
            days
        %li
          %p.lead
            Average
-            %strong #{@commits_graph.commit_per_day}
+            %strong= @commits_graph.commit_per_day
            commits per day
        %li
          %p.lead
            Contributed by
-            %strong #{@commits_graph.authors}
+            %strong= @commits_graph.authors
            authors
    .col-md-6
      %div
--- a/app/views/projects/merge_requests/_new_submit.html.haml
+++ b/app/views/projects/merge_requests/_new_submit.html.haml
@ -3,9 +3,9 @@
 %p.slead
  - source_title, target_title = format_mr_branch_names(@merge_request)
  From
-  %strong.label-branch #{source_title}
+  %strong.label-branch= source_title
  %span into
-  %strong.label-branch #{target_title}
+  %strong.label-branch= target_title

  %span.pull-right
    = link_to 'Change branches', mr_change_branches_path(@merge_request)
@ -43,7 +43,7 @@
      #commits.commits.tab-pane.active
        = render "projects/merge_requests/show/commits"
      #diffs.diffs.tab-pane
-        - # This tab is always loaded via AJAX
+        -# This tab is always loaded via AJAX
      - if @pipelines.any?
        #pipelines.pipelines.tab-pane
          = render "projects/merge_requests/show/pipelines"
--- a/app/views/projects/merge_requests/_show.html.haml
+++ b/app/views/projects/merge_requests/_show.html.haml
@ -92,11 +92,11 @@
              = render "projects/merge_requests/discussion"

      #commits.commits.tab-pane
-        - # This tab is always loaded via AJAX
+        -# This tab is always loaded via AJAX
      #pipelines.pipelines.tab-pane
-        - # This tab is always loaded via AJAX
+        -# This tab is always loaded via AJAX
      #diffs.diffs.tab-pane
-        - # This tab is always loaded via AJAX
+        -# This tab is always loaded via AJAX

    .mr-loading-status
      = spinner
--- a/app/views/projects/merge_requests/show/_versions.html.haml
+++ b/app/views/projects/merge_requests/show/_versions.html.haml
@ -25,7 +25,7 @@
                        latest version
                      - else
                        version #{version_index(merge_request_diff)}
-                    .monospace #{short_sha(merge_request_diff.head_commit_sha)}
+                    .monospace= short_sha(merge_request_diff.head_commit_sha)
                    %small
                      #{number_with_delimiter(merge_request_diff.commits_count)} #{'commit'.pluralize(merge_request_diff.commits_count)},
                      = time_ago_with_tooltip(merge_request_diff.created_at)
@ -55,14 +55,14 @@
                          latest version
                        - else
                          version #{version_index(merge_request_diff)}
-                      .monospace #{short_sha(merge_request_diff.head_commit_sha)}
+                      .monospace= short_sha(merge_request_diff.head_commit_sha)
                      %small
                        = time_ago_with_tooltip(merge_request_diff.created_at)
                %li
                  = link_to merge_request_version_path(@project, @merge_request, @merge_request_diff), class: ('is-active' unless @start_sha) do
                    %strong
                      #{@merge_request.target_branch} (base)
-                    .monospace #{short_sha(@merge_request_diff.base_commit_sha)}
+                    .monospace= short_sha(@merge_request_diff.base_commit_sha)

    - if different_base?(@start_version, @merge_request_diff)
      .content-block
@ -72,7 +72,7 @@
        = link_to namespace_project_compare_path(@project.namespace, @project, from: @start_version.base_commit_sha, to: @merge_request_diff.base_commit_sha) do
          new commits
        from
-        %code #{@merge_request.target_branch}
+        %code= @merge_request.target_branch

    - unless @merge_request_diff.latest? && !@start_sha
      .comments-disabled-notif.content-block
--- a/app/views/projects/merge_requests/widget/_heading.html.haml
+++ b/app/views/projects/merge_requests/widget/_heading.html.haml
@ -13,8 +13,8 @@
        %span.ci-coverage

 - elsif @merge_request.has_ci?
-  - # 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
+  -# 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
  .mr-widget-heading
    - %w[success skipped canceled failed running pending].each do |status|
      .ci_widget{ class: "ci-#{status} ci-status-icon-#{status}", style: "display:none" }
--- a/app/views/projects/notes/_note.html.haml
+++ b/app/views/projects/notes/_note.html.haml
@ -69,7 +69,7 @@
        - if note_editable
          .original-note-content.hidden{ data: { post_url: namespace_project_note_path(@project.namespace, @project, note), target_id: note.noteable.id, target_type: note.noteable.class.name.underscore } }
            #{note.note}
-          %textarea.hidden.js-task-list-field.original-task-list #{note.note}
+          %textarea.hidden.js-task-list-field.original-task-list= note.note
        .note-awards
          = render 'award_emoji/awards_block', awardable: note, inline: false
        - if note.system
--- a/app/views/projects/project_members/_group_members.html.haml
+++ b/app/views/projects/project_members/_group_members.html.haml
@ -1,7 +1,7 @@
 .panel.panel-default
  .panel-heading
    Group members with access to
-    %strong #{@group.name}
+    %strong= @group.name
    %span.badge= members.size
    - if can?(current_user, :admin_group_member, @group)
      .controls
--- a/app/views/projects/project_members/_groups.html.haml
+++ b/app/views/projects/project_members/_groups.html.haml
@ -1,7 +1,7 @@
 .panel.panel-default.project-members-groups
  .panel-heading
    Groups with access to
-    %strong #{@project.name}
+    %strong= @project.name
    %span.badge= group_links.size
  %ul.content-list
    = render partial: 'shared/members/group', collection: group_links, as: :group_link
--- a/app/views/projects/project_members/_shared_group_members.html.haml
+++ b/app/views/projects/project_members/_shared_group_members.html.haml
@ -5,9 +5,9 @@
  .panel.panel-default
    .panel-heading
      Shared with
-      %strong #{shared_group.name}
+      %strong= shared_group.name
      group, members with
-      %strong #{group_links.human_access}
+      %strong= group_links.human_access
      role (#{shared_group_users_count})
      - if can?(current_user, :admin_group, shared_group)
        .panel-head-actions
--- a/app/views/projects/project_members/_team.html.haml
+++ b/app/views/projects/project_members/_team.html.haml
@ -1,7 +1,7 @@
 .panel.panel-default
  .panel-heading
    Members with access to
-    %strong #{@project.name}
+    %strong= @project.name
    %span.badge= @project_members.total_count
    = form_tag namespace_project_settings_members_path(@project.namespace, @project), method: :get, class: 'form-inline member-search-form'  do
      .form-group
--- a/app/views/projects/releases/edit.html.haml
+++ b/app/views/projects/releases/edit.html.haml
@ -7,7 +7,7 @@
    .oneline
      .title
        Release notes for tag
-        %strong #{@tag.name}
+        %strong= @tag.name


  = form_for(@release, method: :put, url: namespace_project_tag_release_path(@project.namespace, @project, @tag.name), html: { class: 'form-horizontal common-note-form release-form js-quick-submit' }) do |f|
--- a/app/views/projects/runners/_specific_runners.html.haml
+++ b/app/views/projects/runners/_specific_runners.html.haml
@ -9,10 +9,10 @@
      (checkout the #{link_to 'GitLab Runner section', 'https://about.gitlab.com/gitlab-ci/#gitlab-runner', target: '_blank'} for information on how to install it).
    %li
      Specify the following URL during the Runner setup:
-      %code #{ci_root_url(only_path: false)}
+      %code= ci_root_url(only_path: false)
    %li
      Use the following registration token during setup:
-      %code #{@project.runners_token}
+      %code= @project.runners_token
    %li
      Start the Runner!

--- a/app/views/projects/services/mattermost_slash_commands/_installation_info.html.haml
+++ b/app/views/projects/services/mattermost_slash_commands/_installation_info.html.haml
@ -4,4 +4,4 @@
      .col-sm-9.col-sm-offset-3
        = link_to new_namespace_project_mattermost_path(@project.namespace, @project), class: 'btn btn-lg' do
          = custom_icon('mattermost_logo', size: 15)
-          = 'Add to Mattermost'
+          Add to Mattermost
--- a/app/views/search/results/_empty.html.haml
+++ b/app/views/search/results/_empty.html.haml
@ -3,4 +3,4 @@
  %h4
    = icon('search')
    We couldn't find any results matching
-    %code #{@search_term}
+    %code= @search_term
--- a/app/views/search/results/_merge_request.html.haml
+++ b/app/views/search/results/_merge_request.html.haml
@ -2,7 +2,7 @@
  %h4
    = link_to [merge_request.target_project.namespace.becomes(Namespace), merge_request.target_project, merge_request] do
      %span.term.str-truncated= merge_request.title
-    .pull-right #{merge_request.to_reference}
+    .pull-right= merge_request.to_reference
  - if merge_request.description.present?
    .description.term
      = preserve do
--- a/app/views/search/results/_snippet_blob.html.haml
+++ b/app/views/search/results/_snippet_blob.html.haml
@ -9,7 +9,7 @@
    = link_to user_snippets_path(snippet.author) do
      = image_tag avatar_icon(snippet.author_email), class: "avatar avatar-inline s16", alt: ''
      = snippet.author_name
-    %span.light #{time_ago_with_tooltip(snippet.created_at)}
+    %span.light= time_ago_with_tooltip(snippet.created_at)
  %h4.snippet-title
  - snippet_path = reliable_snippet_path(snippet)
  = link_to snippet_path do
--- a/app/views/search/results/_snippet_title.html.haml
+++ b/app/views/search/results/_snippet_title.html.haml
@ -20,4 +20,4 @@
      = link_to user_snippets_path(snippet_title.author) do
        = image_tag avatar_icon(snippet_title.author_email), class: "avatar avatar-inline s16", alt: ''
        = snippet_title.author_name
-      %span.light #{time_ago_with_tooltip(snippet_title.created_at)}
+      %span.light= time_ago_with_tooltip(snippet_title.created_at)
--- a/app/views/shared/_confirm_modal.html.haml
+++ b/app/views/shared/_confirm_modal.html.haml
@ -14,7 +14,7 @@
          To prevent accidental actions we ask you to confirm your intention.
          %br
          Please type
-          %code.js-confirm-danger-match #{phrase}
+          %code.js-confirm-danger-match= phrase
          to proceed or close this modal to cancel.

        .form-group
--- a/app/views/shared/_milestones_filter.html.haml
+++ b/app/views/shared/_milestones_filter.html.haml
@ -6,14 +6,14 @@
    = link_to milestones_filter_path(state: 'opened') do
      Open
      - if @project
-        %span.badge #{counts[:opened]}
+        %span.badge= counts[:opened]
  %li{ class: milestone_class_for_state(params[:state], 'closed') }>
    = link_to milestones_filter_path(state: 'closed') do
      Closed
      - if @project
-        %span.badge #{counts[:closed]}
+        %span.badge= counts[:closed]
  %li{ class: milestone_class_for_state(params[:state], 'all') }>
    = link_to milestones_filter_path(state: 'all') do
      All
      - if @project
-        %span.badge #{counts[:all]}
+        %span.badge= counts[:all]
--- a/app/views/shared/groups/_group.html.haml
+++ b/app/views/shared/groups/_group.html.haml
@ -32,7 +32,7 @@

    - if group_member
      as
-      %span #{group_member.human_access}
+      %span= group_member.human_access

  - if group.description.present?
    .description
--- a/app/views/shared/issuable/_form.html.haml
+++ b/app/views/shared/issuable/_form.html.haml
@ -68,7 +68,7 @@
  - if !issuable.persisted? && !issuable.project.empty_repo? && (guide_url = contribution_guide_path(issuable.project))
    .inline.prepend-left-10
      Please review the
-      %strong #{link_to 'contribution guidelines', guide_url}
+      %strong= link_to('contribution guidelines', guide_url)
      for this project.

  - if issuable.new_record?
--- a/app/views/shared/tokens/_scopes_form.html.haml
+++ b/app/views/shared/tokens/_scopes_form.html.haml
@ -5,5 +5,5 @@
 - scopes.each do |scope|
  %fieldset
    = check_box_tag "#{prefix}[scopes][]", scope, token.scopes.include?(scope), id: "#{prefix}_scopes_#{scope}"
-    = label_tag "#{prefix}_scopes_#{scope}", scope
-    %span= "(#{t(scope, scope: [:doorkeeper, :scopes])})"
+    = label_tag ("#{prefix}_scopes_#{scope}"), scope
+    %span= t(scope, scope: [:doorkeeper, :scopes])
--- a/app/views/users/calendar_activities.html.haml
+++ b/app/views/users/calendar_activities.html.haml
@ -1,6 +1,6 @@
 %h4.prepend-top-20
  Contributions for
-  %strong #{@calendar_date.to_s(:short)}
+  %strong= @calendar_date.to_s(:short)

 - if @events.any?
  %ul.bordered-list
--- a/app/views/users/show.html.haml
+++ b/app/views/users/show.html.haml
@ -110,16 +110,16 @@
        = spinner

      #groups.tab-pane
-        - # This tab is always loaded via AJAX
+        -# This tab is always loaded via AJAX

      #contributed.tab-pane
-        - # This tab is always loaded via AJAX
+        -# This tab is always loaded via AJAX

      #projects.tab-pane
-        - # This tab is always loaded via AJAX
+        -# This tab is always loaded via AJAX

      #snippets.tab-pane
-        - # This tab is always loaded via AJAX
+        -# This tab is always loaded via AJAX

    .loading-status
      = spinner