Merge branch '22072-enable-haml-lints' into 'master'

Enable HAML-LINT linters Closes #22072 See merge request !8247
2016-12-31 12:00:11 +00:00 · 2016-12-31 12:00:11 +00:00 · 8dc2163ce5
parent 44fddd29e1 f79680c53f
commit 8dc2163ce5
217 changed files with 634 additions and 645 deletions
--- a/.haml-lint.yml
+++ b/.haml-lint.yml
@ -7,10 +7,10 @@ exclude:

 linters:
  AltText:
-    enabled: false
+    enabled: true

  ClassAttributeWithStaticValue:
-    enabled: false
+    enabled: true

  ClassesBeforeIds:
    enabled: false
@ -29,14 +29,14 @@ linters:
    enabled: true

  FinalNewline:
-    enabled: false
+    enabled: true
    present: true

  HtmlAttributes:
-    enabled: false
+    enabled: true

  ImplicitDiv:
-    enabled: false
+    enabled: true

  LeadingCommentSpace:
    enabled: false
@ -80,10 +80,10 @@ linters:
    enabled: false

  SpaceBeforeScript:
-    enabled: false
+    enabled: true

  SpaceInsideHashAttributes:
-    enabled: false
+    enabled: true
    style: space

  Indentation:
@ -94,7 +94,7 @@ linters:
    enabled: true

  TrailingWhitespace:
-    enabled: false
+    enabled: true

  UnnecessaryInterpolation:
    enabled: false
--- a/app/views/admin/groups/show.html.haml
+++ b/app/views/admin/groups/show.html.haml
@ -103,7 +103,7 @@
          = form_tag admin_group_members_update_path(@group), id: "new_project_member", class: "bulk_import", method: :put  do
            %div
              = users_select_tag(:user_ids, multiple: true, email_user: true, scope: :all)
-            %div.prepend-top-10
+            .prepend-top-10
              = select_tag :access_level, options_for_select(GroupMember.access_level_roles), class: "project-access-select select2"
            %hr
            = button_tag 'Add users to group', class: "btn btn-create"
--- a/app/views/admin/hooks/index.html.haml
+++ b/app/views/admin/hooks/index.html.haml
@ -29,7 +29,7 @@
        System hook will be triggered on set of events like creating project
        or adding ssh key. But you can also enable extra triggers like Push events.

-      %div.prepend-top-default
+      .prepend-top-default
        = f.check_box :push_events, class: 'pull-left'
        .prepend-left-20
          = f.label :push_events, class: 'list-label' do
@ -70,4 +70,3 @@
              - if hook.send(trigger)
                %span.label.label-gray= trigger.titleize
            %span.label.label-gray SSL Verification: #{hook.enable_ssl_verification ? "enabled" : "disabled"}
-
--- a/app/views/devise/sessions/_new_base.html.haml
+++ b/app/views/devise/sessions/_new_base.html.haml
@ -1,8 +1,8 @@
 = form_for(resource, as: resource_name, url: session_path(resource_name), html: { class: 'new_user gl-show-field-errors', 'aria-live' => 'assertive'}) do |f|
-  %div.form-group
+  .form-group
    = f.label "Username or email", for: :login
    = f.text_field :login, class: "form-control top", autofocus: "autofocus", autocapitalize: "off", autocorrect: "off", required: true, title: "This field is required."
-  %div.form-group
+  .form-group
    = f.label :password
    = f.password_field :password, class: "form-control bottom", required: true, title: "This field is required."
  - if devise_mapping.rememberable?
@ -12,5 +12,5 @@
        %span Remember me
      .pull-right.forgot-password
        = link_to "Forgot your password?", new_password_path(resource_name)
-  %div.submit-container.move-submit-down
+  .submit-container.move-submit-down
    = f.submit "Sign in", class: "btn btn-save"
--- a/app/views/devise/shared/_omniauth_box.html.haml
+++ b/app/views/devise/shared/_omniauth_box.html.haml
@ -1,4 +1,4 @@
-%div.omniauth-container
+.omniauth-container
  %p
    %span.light
      Sign in with &nbsp;
--- a/app/views/devise/shared/_signin_box.html.haml
+++ b/app/views/devise/shared/_signin_box.html.haml
@ -1,6 +1,6 @@
 - if form_based_providers.any?
  - if crowd_enabled?
-    .login-box.tab-pane.active{id: "crowd", role: 'tabpanel', class: 'tab-pane'}
+    .login-box.tab-pane.active{ id: "crowd", role: 'tabpanel' }
      .login-body
        = render 'devise/sessions/new_crowd'
  - @ldap_servers.each_with_index do |server, i|
--- a/app/views/devise/shared/_signup_box.html.haml
+++ b/app/views/devise/shared/_signup_box.html.haml
@ -1,18 +1,18 @@
-#register-pane.login-box{ role: 'tabpanel', class: 'tab-pane' }
+#register-pane.tab-pane.login-box{ role: 'tabpanel' }
  .login-body
    = form_for(resource, as: "new_#{resource_name}", url: registration_path(resource_name), html: { class: "new_new_user gl-show-field-errors", "aria-live" => "assertive" }) do |f|
      .devise-errors
        = devise_error_messages!
-      %div.form-group
+      .form-group
        = f.label :name
        = f.text_field :name, class: "form-control top", required: true, title: "This field is required."
-      %div.username.form-group
+      .username.form-group
        = f.label :username
        = f.text_field :username, class: "form-control middle", pattern: Gitlab::Regex::NAMESPACE_REGEX_STR_SIMPLE, required: true, title: 'Please create a username with only alphanumeric characters.'
        %p.validation-error.hide Username is already taken.
        %p.validation-success.hide Username is available.
        %p.validation-pending.hide Checking username availability...
-      %div.form-group
+      .form-group
        = f.label :email
        = f.email_field :email, class: "form-control middle", required: true, title: "Please provide a valid email address."
      .form-group.append-bottom-20#password-strength
--- a/app/views/doorkeeper/applications/index.html.haml
+++ b/app/views/doorkeeper/applications/index.html.haml
@ -72,7 +72,7 @@
                %tr
                  %td
                    Anonymous
-                    %div.help-block
+                    .help-block
                      %em Authorization was granted by entering your username and password in the application.
                  %td= token.created_at
                  %td= token.scopes
--- a/app/views/errors/access_denied.html.haml
+++ b/app/views/errors/access_denied.html.haml
@ -1,6 +1,5 @@
 - content_for(:title, 'Access Denied')
-%img{:alt => "GitLab Logo",
-     :src => image_path('logo.svg')}
+%img{ :alt => "GitLab Logo", :src => image_path('logo.svg') }
  %h1
    403
 .container
--- a/app/views/errors/encoding.html.haml
+++ b/app/views/errors/encoding.html.haml
@ -1,6 +1,5 @@
 - content_for(:title, 'Encoding Error')
-%img{:alt => "GitLab Logo",
-     :src => image_path('logo.svg')}
+%img{ :alt => "GitLab Logo", :src => image_path('logo.svg') }
  %h1
    500
 .container
--- a/app/views/errors/git_not_found.html.haml
+++ b/app/views/errors/git_not_found.html.haml
@ -1,6 +1,5 @@
 - content_for(:title, 'Git Resource Not Found')
-%img{:alt => "GitLab Logo",
-     :src => image_path('logo.svg')}
+%img{ :alt => "GitLab Logo", :src => image_path('logo.svg') }
  %h1
    404
 .container
--- a/app/views/errors/not_found.html.haml
+++ b/app/views/errors/not_found.html.haml
@ -1,6 +1,5 @@
 - content_for(:title, 'Not Found')
-%img{:alt => "GitLab Logo",
-     :src => image_path('logo.svg')}
+%img{ :alt => "GitLab Logo", :src => image_path('logo.svg') }
  %h1
    404
 .container
--- a/app/views/errors/omniauth_error.html.haml
+++ b/app/views/errors/omniauth_error.html.haml
@ -1,6 +1,5 @@
 - content_for(:title, 'Auth Error')
-%img{:alt => "GitLab Logo",
-     :src => image_path('logo.svg')}
+%img{ :alt => "GitLab Logo", :src => image_path('logo.svg') }
  %h1
    422
 .container
--- a/app/views/groups/show.html.haml
+++ b/app/views/groups/show.html.haml
@ -22,7 +22,7 @@
        = render 'shared/members/access_request_buttons', source: @group
        = render 'shared/notifications/button', notification_setting: @notification_setting

-%div.groups-header{ class: container_class }
+.groups-header{ class: container_class }
  .top-area
    %ul.nav-links
      %li.active
--- a/app/views/help/_shortcuts.html.haml
+++ b/app/views/help/_shortcuts.html.haml
@ -82,7 +82,7 @@

          .col-lg-4
            %table.shortcut-mappings
-              %tbody{ class: 'hidden-shortcut project', style: 'display:none' }
+              %tbody.hidden-shortcut.project{ style: 'display:none' }
                %tr
                  %th
                  %th Global Dashboard
@ -190,7 +190,7 @@
                  %td New issue
          .col-lg-4
            %table.shortcut-mappings
-              %tbody{ class: 'hidden-shortcut network', style: 'display:none' }
+              %tbody.hidden-shortcut.network{ style: 'display:none' }
                %tr
                  %th
                  %th Network Graph
@ -240,7 +240,7 @@
                    .key
                      shift j
                  %td Scroll to bottom
-              %tbody{ class: 'hidden-shortcut issues', style: 'display:none' }
+              %tbody.hidden-shortcut.issues{ style: 'display:none' }
                %tr
                  %th
                  %th Issues
@ -264,7 +264,7 @@
                  %td.shortcut
                    .key l
                  %td Change Label
-              %tbody{ class: 'hidden-shortcut merge_requests', style: 'display:none' }
+              %tbody.hidden-shortcut.merge_requests{ style: 'display:none' }
                %tr
                  %th
                  %th Merge Requests
--- a/app/views/kaminari/gitlab/_next_page.html.haml
+++ b/app/views/kaminari/gitlab/_next_page.html.haml
@ -6,8 +6,8 @@
 -#    per_page:      number of items to fetch per page
 -#    remote:        data-remote
 - if current_page.last?
-  %li{ class: "next disabled" }
+  %li.next.disabled
    %span= raw(t 'views.pagination.next')
 - else
-  %li{ class: "next" }
+  %li.next
    = link_to raw(t 'views.pagination.next'), url, rel: 'next', remote: remote
--- a/app/views/kaminari/gitlab/_paginator.html.haml
+++ b/app/views/kaminari/gitlab/_paginator.html.haml
@ -6,7 +6,7 @@
 -#    remote:        data-remote
 -#    paginator:     the paginator that renders the pagination tags inside
 = paginator.render do
-  %div.gl-pagination
+  .gl-pagination
    %ul.pagination.clearfix
      - unless current_page.first?
        = first_page_tag unless total_pages < 5 # As kaminari will always show the first 5 pages
@ -19,4 +19,3 @@
      = next_page_tag
      - unless current_page.last?
        = last_page_tag unless total_pages < 5
-
--- a/app/views/kaminari/gitlab/_prev_page.html.haml
+++ b/app/views/kaminari/gitlab/_prev_page.html.haml
@ -6,8 +6,8 @@
 -#    per_page:      number of items to fetch per page
 -#    remote:        data-remote
 - if current_page.first?
-  %li{ class: "prev disabled" }
+  %li.prev.disabled
    %span= raw(t 'views.pagination.previous')
 - else
-  %li{ class: "prev" }
+  %li.prev
    = link_to raw(t 'views.pagination.previous'), url, rel: 'prev', remote: remote
--- a/app/views/layouts/devise.html.haml
+++ b/app/views/layouts/devise.html.haml
@ -1,5 +1,5 @@
 !!! 5
-%html{ lang: "en", class: "devise-layout-html"}
+%html.devise-layout-html
  = render "layouts/head"
  %body.ui_charcoal.login-page.application.navless{ data: { page: body_data_page } }
    .page-wrap
--- a/app/views/layouts/devise_mailer.html.haml
+++ b/app/views/layouts/devise_mailer.html.haml
@ -1,7 +1,7 @@
 !!! 5
 %html
  %head
-    %meta(content='text/html; charset=UTF-8' http-equiv='Content-Type')
+    %meta{ content: 'text/html; charset=UTF-8', 'http-equiv'=> 'Content-Type' }
    = stylesheet_link_tag 'mailers/devise'

  %body
--- a/app/views/layouts/header/_default.html.haml
+++ b/app/views/layouts/header/_default.html.haml
@ -1,6 +1,6 @@
 %header.navbar.navbar-fixed-top.navbar-gitlab{ class: nav_header_class }
-  %a{ href: "#content-body", tabindex: "1", class: "sr-only gl-accessibility" } Skip to content
-  %div{ class: "container-fluid" }
+  %a.sr-only.gl-accessibility{ href: "#content-body", tabindex: "1" } Skip to content
+  .container-fluid
    .header-content
      %button.side-nav-toggle{ type: 'button', "aria-label" => "Toggle global navigation" }
        %span.sr-only Toggle navigation
--- a/app/views/layouts/notify.html.haml
+++ b/app/views/layouts/notify.html.haml
@ -6,9 +6,9 @@
    = stylesheet_link_tag 'notify'
    = yield :head
  %body
-    %div.content
+    .content
      = yield
-    %div.footer{style: "margin-top: 10px;"}
+    .footer{ style: "margin-top: 10px;" }
      %p
        &mdash;
        %br
--- a/app/views/notify/pipeline_failed_email.html.haml
+++ b/app/views/notify/pipeline_failed_email.html.haml
@ -90,7 +90,7 @@
                                      %tbody
                                        %tr
                                          %td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:15px;line-height:1.4;vertical-align:middle;padding-right:5px;" }
-                                            %img{height: "13", src: image_url('mailers/ci_pipeline_notif_v1/icon-branch-gray.gif'), style: "display:block;", width: "13"}/
+                                            %img{ height: "13", src: image_url('mailers/ci_pipeline_notif_v1/icon-branch-gray.gif'), style: "display:block;", width: "13", alt: "Branch icon" }/
                                          %td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:15px;line-height:1.4;vertical-align:middle;" }
                                            %a.muted{ href: commits_url(@pipeline), style: "color:#333333;text-decoration:none;" }
                                              = @pipeline.ref
@ -101,7 +101,7 @@
                                      %tbody
                                        %tr
                                          %td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:15px;line-height:1.4;vertical-align:middle;padding-right:5px;" }
-                                            %img{height: "13", src: image_url('mailers/ci_pipeline_notif_v1/icon-commit-gray.gif'), style: "display:block;", width: "13"}/
+                                            %img{ height: "13", src: image_url('mailers/ci_pipeline_notif_v1/icon-commit-gray.gif'), style: "display:block;", width: "13", alt: "Commit icon" }/
                                          %td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:15px;line-height:1.4;vertical-align:middle;" }
                                            %a{ href: commit_url(@pipeline), style: "color:#3777b0;text-decoration:none;" }
                                              = @pipeline.short_sha
@ -119,7 +119,7 @@
                                        %tr
                                          - commit = @pipeline.commit
                                          %td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:15px;line-height:1.4;vertical-align:middle;padding-right:5px;" }
-                                            %img.avatar{height: "24", src: avatar_icon(commit.author || commit.author_email, 24), style: "display:block;border-radius:12px;margin:-2px 0;", width: "24"}/
+                                            %img.avatar{ height: "24", src: avatar_icon(commit.author || commit.author_email, 24), style: "display:block;border-radius:12px;margin:-2px 0;", width: "24", alt: "Avatar" }/
                                          %td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:15px;line-height:1.4;vertical-align:middle;" }
                                            - if commit.author
                                              %a.muted{ href: user_url(commit.author), style: "color:#333333;text-decoration:none;" }
--- a/app/views/notify/pipeline_success_email.html.haml
+++ b/app/views/notify/pipeline_success_email.html.haml
@ -90,7 +90,7 @@
                                      %tbody
                                        %tr
                                          %td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:15px;line-height:1.4;vertical-align:middle;padding-right:5px;" }
-                                            %img{height: "13", src: image_url('mailers/ci_pipeline_notif_v1/icon-branch-gray.gif'), style: "display:block;", width: "13"}/
+                                            %img{ height: "13", src: image_url('mailers/ci_pipeline_notif_v1/icon-branch-gray.gif'), style: "display:block;", width: "13", alt: "Branch icon" }/
                                          %td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:15px;line-height:1.4;vertical-align:middle;" }
                                            %a.muted{ href: commits_url(@pipeline), style: "color:#333333;text-decoration:none;" }
                                              = @pipeline.ref
@ -101,7 +101,7 @@
                                      %tbody
                                        %tr
                                          %td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:15px;line-height:1.4;vertical-align:middle;padding-right:5px;" }
-                                            %img{height: "13", src: image_url('mailers/ci_pipeline_notif_v1/icon-commit-gray.gif'), style: "display:block;", width: "13"}/
+                                            %img{ height: "13", src: image_url('mailers/ci_pipeline_notif_v1/icon-commit-gray.gif'), style: "display:block;", width: "13", alt: "Commit icon" }/
                                          %td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:15px;line-height:1.4;vertical-align:middle;" }
                                            %a{ href: commit_url(@pipeline), style: "color:#3777b0;text-decoration:none;" }
                                              = @pipeline.short_sha
@ -119,7 +119,7 @@
                                        %tr
                                          - commit = @pipeline.commit
                                          %td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:15px;line-height:1.4;vertical-align:middle;padding-right:5px;" }
-                                            %img.avatar{height: "24", src: avatar_icon(commit.author || commit.author_email, 24), style: "display:block;border-radius:12px;margin:-2px 0;", width: "24"}/
+                                            %img.avatar{ height: "24", src: avatar_icon(commit.author || commit.author_email, 24), style: "display:block;border-radius:12px;margin:-2px 0;", width: "24", alt: "Avatar" }/
                                          %td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:15px;line-height:1.4;vertical-align:middle;" }
                                            - if commit.author
                                              %a.muted{ href: user_url(commit.author), style: "color:#333333;text-decoration:none;" }
--- a/app/views/profiles/keys/index.html.haml
+++ b/app/views/profiles/keys/index.html.haml
@ -17,5 +17,5 @@
    %hr
    %h5
      Your SSH keys (#{@keys.count})
-    %div.append-bottom-default
+    .append-bottom-default
      = render 'key_table'
--- a/app/views/profiles/notifications/show.html.haml
+++ b/app/views/profiles/notifications/show.html.haml
@ -3,7 +3,7 @@

 %div
  - if @user.errors.any?
-    %div.alert.alert-danger
+    .alert.alert-danger
      %ul
        - @user.errors.full_messages.each do |msg|
          %li= msg
--- a/app/views/profiles/show.html.haml
+++ b/app/views/profiles/show.html.haml
@ -108,7 +108,7 @@
          Position and size your new avatar
      .modal-body
        .profile-crop-image-container
-          %img.modal-profile-crop-image
+          %img.modal-profile-crop-image{ alt: "Avatar cropper" }
        .crop-controls
          .btn-group
            %button.btn.btn-primary{ data: { method: "zoom", option: "0.1" } }
--- a/app/views/projects/_bitbucket_import_modal.html.haml
+++ b/app/views/projects/_bitbucket_import_modal.html.haml
@ -1,4 +1,4 @@
-%div#bitbucket_import_modal.modal
+#bitbucket_import_modal.modal
  .modal-dialog
    .modal-content
      .modal-header
@ -10,4 +10,4 @@
          as administrator you need to configure
        - else
          ask your GitLab administrator to configure
-        == #{link_to 'OAuth integration', help_page_path("integration/bitbucket")}.
+        = link_to 'OAuth integration', help_page_path("integration/bitbucket")
--- a/app/views/projects/_customize_workflow.html.haml
+++ b/app/views/projects/_customize_workflow.html.haml
@ -1,5 +1,5 @@
 .row-content-block.project-home-empty
-  %div.text-center{ class: container_class }
+  .text-center{ class: container_class }
    %h4
      Customize your workflow!
    %p
--- a/app/views/projects/_gitlab_import_modal.html.haml
+++ b/app/views/projects/_gitlab_import_modal.html.haml
@ -1,4 +1,4 @@
-%div#gitlab_import_modal.modal
+#gitlab_import_modal.modal
  .modal-dialog
    .modal-content
      .modal-header
@ -10,4 +10,4 @@
          as administrator you need to configure
        - else
          ask your GitLab administrator to configure
-        == #{link_to 'OAuth integration', help_page_path("integration/gitlab")}.
+        = link_to 'OAuth integration', help_page_path("integration/gitlab")
--- a/app/views/projects/_md_preview.html.haml
+++ b/app/views/projects/_md_preview.html.haml
@ -31,7 +31,7 @@
  .md.md-preview-holder.js-md-preview.hide{ class: (preview_class if defined?(preview_class)) }

  - if defined?(referenced_users) && referenced_users
-    %div.referenced-users.hide
+    .referenced-users.hide
      %span
        = icon("exclamation-triangle")
        You are about to add
--- a/app/views/projects/_wiki.html.haml
+++ b/app/views/projects/_wiki.html.haml
@ -7,7 +7,7 @@
 - else
  - can_create_wiki = can?(current_user, :create_wiki, @project)
  .project-home-empty{ class: [('row-content-block' if can_create_wiki), ('content-block' unless can_create_wiki)] }
-    %div.text-center{ class: container_class }
+    .text-center{ class: container_class }
      %h4
        This project does not have a wiki homepage yet
      - if can_create_wiki
--- a/app/views/projects/artifacts/browse.html.haml
+++ b/app/views/projects/artifacts/browse.html.haml
@ -8,7 +8,7 @@
      Download artifacts archive

 .tree-holder
-  %div.tree-content-holder
+  .tree-content-holder
    %table.table.tree-table
      %thead
        %tr
--- a/app/views/projects/blob/_blob.html.haml
+++ b/app/views/projects/blob/_blob.html.haml
@ -22,7 +22,7 @@
  - blob_commit = @repository.last_commit_for_path(@commit.id, blob.path)
  = render blob_commit, project: @project, ref: @ref

-%div#blob-content-holder.blob-content-holder
+#blob-content-holder.blob-content-holder
  %article.file-holder
    .file-title
      = blob_icon blob.mode, blob.name
--- a/app/views/projects/blob/_image.html.haml
+++ b/app/views/projects/blob/_image.html.haml
@ -5,11 +5,11 @@
      - # 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)}"}
+      %img{ src: "data:#{blob.mime_type};base64,#{Base64.encode64(blob.data)}", alt: "#{blob.name}" }
    - else
      .nothing-here-block
        The SVG could not be displayed as it is too large, you can
        #{link_to('view the raw file', namespace_project_raw_path(@project.namespace, @project, @id), target: '_blank')}
        instead.
  - else
-    %img{src: namespace_project_raw_path(@project.namespace, @project, tree_join(@commit.id, blob.path))}
+    %img{ src: namespace_project_raw_path(@project.namespace, @project, tree_join(@commit.id, blob.path)), alt: "#{blob.name}" }
--- a/app/views/projects/blob/_upload.html.haml
+++ b/app/views/projects/blob/_upload.html.haml
@ -12,7 +12,7 @@
                Attach a file by drag &amp; drop or
                = link_to 'click to upload', '#', class: "markdown-selector"
          %br
-          .dropzone-alerts{class: "alert alert-danger data", style: "display:none"}
+          .dropzone-alerts.alert.alert-danger.data{ style: "display:none" }

          = render 'shared/new_commit_form', placeholder: placeholder

--- a/app/views/projects/blob/show.html.haml
+++ b/app/views/projects/blob/show.html.haml
@ -5,7 +5,7 @@
 %div{ class: container_class }
  = render 'projects/last_push'

-  %div#tree-holder.tree-holder
+  #tree-holder.tree-holder
    = render 'blob', blob: @blob

  - if can_edit_blob?(@blob)
--- a/app/views/projects/boards/components/_card.html.haml
+++ b/app/views/projects/boards/components/_card.html.haml
@ -17,7 +17,7 @@
      ":title" => '"Assigned to " + issue.assignee.name',
      "v-if" => "issue.assignee",
      data: { container: 'body' } }
-      %img.avatar.avatar-inline.s20{ ":src" => "issue.assignee.avatar", width: 20, height: 20 }
+      %img.avatar.avatar-inline.s20{ ":src" => "issue.assignee.avatar", width: 20, height: 20, alt: "Avatar" }
    %button.label.color-label.has-tooltip{ "v-for" => "label in issue.labels",
      type: "button",
      "v-if" => "(!list.label || label.id !== list.label.id)",
--- a/app/views/projects/boards/components/sidebar/_assignee.html.haml
+++ b/app/views/projects/boards/components/sidebar/_assignee.html.haml
@ -14,7 +14,7 @@
    %a.author_link.bold{ ":href" => "'#{root_url}' + issue.assignee.username",
      "v-if" => "issue.assignee" }
      %img.avatar.avatar-inline.s32{ ":src" => "issue.assignee.avatar",
-        width: "32" }
+        width: "32", alt: "Avatar" }
      %span.author
        {{ issue.assignee.name }}
      %span.username
--- a/app/views/projects/branches/_branch.html.haml
+++ b/app/views/projects/branches/_branch.html.haml
@ -4,7 +4,7 @@
 - number_commits_behind = diverging_commit_counts[:behind]
 - number_commits_ahead = diverging_commit_counts[:ahead]
 - merge_project = can?(current_user, :create_merge_request, @project) ? @project : (current_user && current_user.fork_of(@project))
-%li(class="js-branch-#{branch.name}")
+%li{ class: "js-branch-#{branch.name}" }
  %div
    = link_to namespace_project_tree_path(@project.namespace, @project, branch.name), class: 'item-title str-truncated' do
      = branch.name
@ -12,7 +12,7 @@
    - if branch.name == @repository.root_ref
      %span.label.label-primary default
    - elsif @repository.merged_to_root_ref? branch.name
-      %span.label.label-info.has-tooltip(title="Merged into #{@repository.root_ref}")
+      %span.label.label-info.has-tooltip{ title: "Merged into #{@repository.root_ref}" }
        merged

    - if @project.protected_branch? branch.name
--- a/app/views/projects/branches/new.html.haml
+++ b/app/views/projects/branches/new.html.haml
@ -2,7 +2,7 @@

 - if @error
  .alert.alert-danger
-    %button{ type: "button", class: "close", "data-dismiss" => "alert"} &times;
+    %button.close{ type: "button", "data-dismiss" => "alert" } &times;
    = @error
 %h3.page-title
  New Branch
--- a/app/views/projects/builds/index.html.haml
+++ b/app/views/projects/builds/index.html.haml
@ -19,5 +19,5 @@
        = link_to ci_lint_path, class: 'btn btn-default' do
          %span CI Lint

-  %div.content-list.builds-content-list
+  .content-list.builds-content-list
    = render "table", builds: @builds, project: @project
--- a/app/views/projects/builds/show.html.haml
+++ b/app/views/projects/builds/show.html.haml
@ -56,10 +56,10 @@
      - else
        #js-build-scroll.scroll-controls
          .scroll-step
-            %a{ href: '#up-build-trace', id: 'scroll-top', class: 'scroll-link scroll-top', title: 'Scroll to top' }
+            %a.scroll-link.scroll-top{ href: '#up-build-trace', id: 'scroll-top', title: 'Scroll to top' }
              = custom_icon('scroll_up')
              = custom_icon('scroll_up_hover_active')
-            %a{ href: '#down-build-trace', id: 'scroll-bottom', class: 'scroll-link scroll-bottom', title: 'Scroll to bottom' }
+            %a.scroll-link.scroll-bottom{ href: '#down-build-trace', id: 'scroll-bottom', title: 'Scroll to bottom' }
              = custom_icon('scroll_down')
              = custom_icon('scroll_down_hover_active')
          - if @build.active?
--- a/app/views/projects/buttons/_fork.html.haml
+++ b/app/views/projects/buttons/_fork.html.haml
@ -8,7 +8,7 @@
      = link_to new_namespace_project_fork_path(@project.namespace, @project), title: 'Fork project', class: 'btn' do
        = custom_icon('icon_fork')
        %span Fork
-    %div.count-with-arrow
+    .count-with-arrow
      %span.arrow
      = link_to namespace_project_forks_path(@project.namespace, @project), title: 'Forks', class: 'count' do
        = @project.forks_count
--- a/app/views/projects/buttons/_star.html.haml
+++ b/app/views/projects/buttons/_star.html.haml
@ -6,7 +6,7 @@
    - else
      = icon('star-o')
      %span Star
-  %div.count-with-arrow
+  .count-with-arrow
    %span.arrow
    %span.count.star-count
      = @project.star_count
@ -15,7 +15,7 @@
  = link_to new_user_session_path, class: 'btn has-tooltip star-btn', title: 'You must sign in to star a project' do
    = icon('star')
    Star
-  %div.count-with-arrow
+  .count-with-arrow
    %span.arrow
    %span.count
      = @project.star_count
--- a/app/views/projects/commit/show.html.haml
+++ b/app/views/projects/commit/show.html.haml
@ -8,7 +8,7 @@
  - if @commit.status
    = render "ci_menu"
  - else
-    %div.block-connector
+    .block-connector
  = render "projects/diffs/diffs", diffs: @diffs
  = render "projects/notes/notes_with_form"
  - if can_collaborate_with_project?
--- a/app/views/projects/commits/_commit_list.html.haml
+++ b/app/views/projects/commits/_commit_list.html.haml
@ -1,7 +1,7 @@
 - commits, hidden = limited_commits(@commits)
 - commits = Commit.decorate(commits, @project)

-%div.panel.panel-default
+.panel.panel-default
  .panel-heading
    Commits (#{@commits.count})
  - if hidden > 0
--- a/app/views/projects/deployments/_commit.html.haml
+++ b/app/views/projects/deployments/_commit.html.haml
@ -1,4 +1,4 @@
-%div.branch-commit
+.branch-commit
  - if deployment.ref
    .icon-container
      = deployment.tag? ? icon('tag') : icon('code-fork')
--- a/app/views/projects/diffs/_image.html.haml
+++ b/app/views/projects/diffs/_image.html.haml
@ -8,15 +8,15 @@
  .image
    %span.wrap
      .frame{ class: image_diff_class(diff) }
-        %img{src: diff.deleted_file ? old_file_raw_path : file_raw_path}
+        %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}"
 - else
  .image
-    %div.two-up.view
+    .two-up.view
      %span.wrap
        .frame.deleted
          %a{ href: namespace_project_blob_path(@project.namespace, @project, tree_join(diff_file.old_ref, diff.old_path)) }
-            %img{src: old_file_raw_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}"
          |
@ -28,7 +28,7 @@
      %span.wrap
        .frame.added
          %a{ href: namespace_project_blob_path(@project.namespace, @project, tree_join(diff_file.new_ref, diff.new_path)) }
-            %img{src: file_raw_path}
+            %img{ src: file_raw_path, alt: diff.new_path }
        %p.image-info.hide
          %span.meta-filesize= "#{number_to_human_size file.size}"
          |
@ -38,23 +38,23 @@
          %b H:
          %span.meta-height

-    %div.swipe.view.hide
+    .swipe.view.hide
      .swipe-frame
        .frame.deleted
-          %img{src: old_file_raw_path}
+          %img{ src: old_file_raw_path, alt: diff.old_path }
        .swipe-wrap
          .frame.added
-            %img{src: file_raw_path}
+            %img{ src: file_raw_path, alt: diff.new_path }
        %span.swipe-bar
          %span.top-handle
          %span.bottom-handle

-    %div.onion-skin.view.hide
+    .onion-skin.view.hide
      .onion-skin-frame
        .frame.deleted
-          %img{src: old_file_raw_path}
+          %img{ src: old_file_raw_path, alt: diff.old_path }
        .frame.added
-          %img{src: file_raw_path}
+          %img{ src: file_raw_path, alt: diff.new_path }
        .controls
          .transparent
          .drag-track
--- a/app/views/projects/diffs/_parallel_view.html.haml
+++ b/app/views/projects/diffs/_parallel_view.html.haml
@ -1,5 +1,5 @@
 / Side-by-side diff view
-%div.text-file.diff-wrap-lines.code.js-syntax-highlight{ data: diff_view_data }
+.text-file.diff-wrap-lines.code.js-syntax-highlight{ data: diff_view_data }
  %table
    - last_line = 0
    - diff_file.parallel_diff_lines.each do |line|
--- a/app/views/projects/diffs/_stats.html.haml
+++ b/app/views/projects/diffs/_stats.html.haml
@ -34,4 +34,3 @@
              %a{ href: "##{file_hash}" }
                %i.fa.fa-adjust
                = diff_file.new_path
-
--- a/app/views/projects/empty.html.haml
+++ b/app/views/projects/empty.html.haml
@ -32,7 +32,7 @@
    .empty_wrapper
      %h3.page-title-empty
        Command line instructions
-      %div.git-empty
+      .git-empty
        %fieldset
          %h5 Git global setup
          %pre.light-well
--- a/app/views/projects/find_file/show.html.haml
+++ b/app/views/projects/find_file/show.html.haml
@ -11,7 +11,7 @@
      %li.file-finder
        %input#file_find.form-control.file-finder-input{ type: "text", placeholder: 'Find by path', autocomplete: 'off' }

-  %div.tree-content-holder
+  .tree-content-holder
    .table-holder
      %table.table.files-slider{ class: "table_#{@hex_path} tree-table table-striped" }
        %tbody
--- 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/merge_requests/conflicts/_submit_form.html.haml
+++ b/app/views/projects/merge_requests/conflicts/_submit_form.html.haml
@ -10,7 +10,7 @@
    .col-sm-offset-2.col-sm-10
      .row
        .col-xs-6
-          %button{ type: "button", class: "btn btn-success js-submit-button", "@click" => "commit()", ":disabled" => "!readyToCommit" }
+          %button.btn.btn-success.js-submit-button{ type: "button", "@click" => "commit()", ":disabled" => "!readyToCommit" }
            %span {{commitButtonText}}
        .col-xs-6.text-right
          = link_to "Cancel", namespace_project_merge_request_path(@merge_request.project.namespace, @merge_request.project, @merge_request), class: "btn btn-cancel"
--- a/app/views/projects/merge_requests/show/_how_to_merge.html.haml
+++ b/app/views/projects/merge_requests/show/_how_to_merge.html.haml
@ -1,4 +1,4 @@
-%div#modal_merge_info.modal
+#modal_merge_info.modal
  .modal-dialog
    .modal-content
      .modal-header
--- a/app/views/projects/merge_requests/show/_versions.html.haml
+++ b/app/views/projects/merge_requests/show/_versions.html.haml
@ -1,6 +1,6 @@
 - if @merge_request_diffs.size > 1
  .mr-version-controls
-    %div.mr-version-menus-container.content-block
+    .mr-version-menus-container.content-block
      Changes between
      %span.dropdown.inline.mr-version-dropdown
        %a.dropdown-toggle.btn.btn-default{ data: {toggle: :dropdown} }
--- a/app/views/projects/merge_requests/widget/_open.html.haml
+++ b/app/views/projects/merge_requests/widget/_open.html.haml
@ -43,5 +43,3 @@
          #{"Issue".pluralize(mr_issues_mentioned_but_not_closing.size)}
          != markdown issues_sentence(mr_issues_mentioned_but_not_closing), pipeline: :gfm, author: @merge_request.author
          #{mr_issues_mentioned_but_not_closing.size > 1 ? 'are' : 'is'} mentioned but will not be closed.
-         
-
--- a/app/views/projects/new.html.haml
+++ b/app/views/projects/new.html.haml
@ -77,7 +77,7 @@
                  - if git_import_enabled?
                    = link_to "#", class: 'btn js-toggle-button import_git' do
                      = icon('git', text: 'Repo by URL')
-                %div{ class: 'import_gitlab_project' }
+                .import_gitlab_project
                  - if gitlab_project_import_enabled?
                    = link_to new_import_gitlab_project_path, class: 'btn btn_import_gitlab_project project-submit' do
                      = icon('gitlab', text: 'GitLab export')
--- a/app/views/projects/notes/_note.html.haml
+++ b/app/views/projects/notes/_note.html.haml
@ -15,7 +15,7 @@
          - unless note.system
            commented
          - if note.system
-            %span{class: 'system-note-message'}
+            %span.system-note-message
              = note.redacted_note_html
          %a{ href: "##{dom_id(note)}" }
            = time_ago_with_tooltip(note.created_at, placement: 'bottom', html_class: 'note-created-ago')
--- a/app/views/projects/pipelines/index.html.haml
+++ b/app/views/projects/pipelines/index.html.haml
@ -36,7 +36,7 @@
        = link_to ci_lint_path, class: 'btn btn-default' do
          %span CI Lint

-  %div.content-list.pipelines
+  .content-list.pipelines
    - if @pipelines.blank?
      %div
        .nothing-here-block No pipelines to show
--- a/app/views/projects/pipelines/show.html.haml
+++ b/app/views/projects/pipelines/show.html.haml
@ -2,7 +2,7 @@
 - page_title "Pipeline"
 = render "projects/pipelines/head"

-%div.js-pipeline-container{ class: container_class, data: { controller_action: "#{controller.action_name}" } }
+.js-pipeline-container{ class: container_class, data: { controller_action: "#{controller.action_name}" } }
  - if @commit
    = render "projects/pipelines/info"

--- a/app/views/projects/snippets/show.html.haml
+++ b/app/views/projects/snippets/show.html.haml
@ -15,4 +15,4 @@
  .row-content-block.top-block.content-component-block
    = render 'award_emoji/awards_block', awardable: @snippet, inline: true

-  %div#notes= render "projects/notes/notes_with_form"
+  #notes= render "projects/notes/notes_with_form"
--- a/app/views/projects/stage/_graph.html.haml
+++ b/app/views/projects/stage/_graph.html.haml
@ -17,4 +17,3 @@
          %li.build{ 'id' => "ci-badge-#{group_name}" }
            .curve
            = render 'projects/stage/in_stage_group', name: group_name, subject: grouped_statuses
-
--- a/app/views/projects/tags/index.html.haml
+++ b/app/views/projects/tags/index.html.haml
@ -2,7 +2,7 @@
 - page_title "Tags"
 = render "projects/commits/head"

-%div.flex-list{ class: container_class }
+.flex-list{ class: container_class }
  .top-area.flex-row
    .nav-text.row-main-content
      Tags give the ability to mark specific points in history as being important
--- a/app/views/projects/tags/new.html.haml
+++ b/app/views/projects/tags/new.html.haml
@ -2,7 +2,7 @@

 - if @error
  .alert.alert-danger
-    %button{ type: "button", class: "close", "data-dismiss" => "alert"} &times;
+    %button.close{ type: "button", "data-dismiss" => "alert" } &times;
    = @error

 %h3.page-title
--- a/app/views/projects/tree/_submodule_item.html.haml
+++ b/app/views/projects/tree/_submodule_item.html.haml
@ -1,4 +1,4 @@
-%tr{ class: "tree-item" }
+%tr.tree-item
  %td.tree-item-file-name
    %i.fa.fa-archive.fa-fw
    = submodule_link(submodule_item, @ref)
--- a/app/views/projects/tree/_tree_content.html.haml
+++ b/app/views/projects/tree/_tree_content.html.haml
@ -1,4 +1,4 @@
-%div.tree-content-holder
+.tree-content-holder
  .table-holder
    %table.table#tree-slider{ class: "table_#{@hex_path} tree-table" }
      %thead
--- a/app/views/projects/wikis/_new.html.haml
+++ b/app/views/projects/wikis/_new.html.haml
@ -1,7 +1,7 @@
 - @no_container = true

 %div{ class: container_class }
-  %div#modal-new-wiki.modal
+  #modal-new-wiki.modal
    .modal-dialog
      .modal-content
        .modal-header
--- a/app/views/shared/issuable/_participants.html.haml
+++ b/app/views/shared/issuable/_participants.html.haml
@ -13,7 +13,7 @@
      .participants-author.js-participants-author
        = link_to_member(@project, participant, name: false, size: 24)
    - if participants_extra > 0
-      %div.participants-more
+      .participants-more
        %a.js-participants-more{ href: "#", data: { original_text: "+ #{participants_size - 7} more", less_text: "- show less" } }
          + #{participants_extra} more
 :javascript
--- a/app/views/shared/members/_group.html.haml
+++ b/app/views/shared/members/_group.html.haml
@ -3,7 +3,7 @@
 - can_admin_member = can?(current_user, :admin_project_member, @project)
 - dom_id = "group_member_#{group_link.id}"
 %li.member.group_member{ id: dom_id }
-  %span{ class: "list-item-name" }
+  %span.list-item-name
    = image_tag group_icon(group), class: "avatar s40", alt: ''
    %strong
      = link_to group.name, group_path(group)
--- a/app/views/shared/milestones/_issuable.html.haml
+++ b/app/views/shared/milestones/_issuable.html.haml
@ -14,15 +14,15 @@
    - if issuable.is_a?(Issue)
      = confidential_icon(issuable)
    = link_to_gfm issuable.title, [project.namespace.becomes(Namespace), project, issuable], title: issuable.title
-  %div{class: 'issuable-detail'}
+  .issuable-detail
    = link_to [project.namespace.becomes(Namespace), project, issuable] do
-      %span{ class: 'issuable-number' }>= issuable.to_reference
+      %span.issuable-number >= issuable.to_reference

    - issuable.labels.each do |label|
      = link_to polymorphic_path(base_url_args, { milestone_title: @milestone.title, label_name: label.title, state: 'all' }) do
        - render_colored_label(label)

-    %span{ class: "assignee-icon" }
+    %span.assignee-icon
      - if assignee
        = link_to polymorphic_path(base_url_args, { milestone_title: @milestone.title, assignee_id: issuable.assignee_id, state: 'all' }),
                  class: 'has-tooltip', title: "Assigned to #{assignee.name}", data: { container: 'body' } do
--- a/app/views/sherlock/queries/show.html.haml
+++ b/app/views/sherlock/queries/show.html.haml
@ -3,10 +3,10 @@

 %ul.nav-links
  %li.active
-    %a(href="#tab-general" data-toggle="tab")
+    %a{ href: "#tab-general", data: { toggle: "tab" } }
      = t('sherlock.general')
  %li
-    %a(href="#tab-backtrace" data-toggle="tab")
+    %a{ href: "#tab-backtrace", data: { toggle: "tab" } }
      = t('sherlock.backtrace')

 .row-content-block
--- a/app/views/sherlock/transactions/show.html.haml
+++ b/app/views/sherlock/transactions/show.html.haml
@ -3,15 +3,15 @@

 %ul.nav-links
  %li.active
-    %a(href="#tab-general" data-toggle="tab")
+    %a{ href: "#tab-general", data: { toggle: "tab" } }
      = t('sherlock.general')
  %li
-    %a(href="#tab-queries" data-toggle="tab")
+    %a{ href: "#tab-queries", data: { toggle: "tab" } }
      = t('sherlock.queries')
      %span.badge
        #{@transaction.queries.length}
  %li
-    %a(href="#tab-file-samples" data-toggle="tab")
+    %a{ href: "#tab-file-samples", data: { toggle: "tab" } }
      = t('sherlock.file_samples')
      %span.badge
        #{@transaction.file_samples.length}
--- a/app/views/u2f/_register.html.haml
+++ b/app/views/u2f/_register.html.haml
@ -27,7 +27,7 @@
    %a.btn.btn-warning#js-u2f-try-again Try again?

 %script#js-register-u2f-registered{ type: "text/template" }
-  %div.row.append-bottom-10
+  .row.append-bottom-10
    .col-md-12
      %p Your device was successfully set up! Give it a name and register it with the GitLab server.
      = form_tag(create_u2f_profile_two_factor_auth_path, method: :post) do