Fix haml lint offenses

app/views/admin/emails/show.html.haml

@@ -6,17 +6,17 @@
 
 = form_tag admin_email_path, class: 'form-horizontal', id: 'new-admin-email' do
   .form-group
-    %label.control-label{for: :subject} Subject
+    %label.control-label{ for: :subject } Subject
     .col-sm-10
       = text_field_tag :subject, '', class: 'form-control', required: true
 
   .form-group
-    %label.control-label{for: :body} Body
+    %label.control-label{ for: :body } Body
     .col-sm-10
       = text_area_tag :body, '', class: 'form-control', rows: 15, required: true
 
   .form-group
-    %label.control-label{for: :recipients} Recipient group
+    %label.control-label{ for: :recipients } Recipient group
     .col-sm-10
       = admin_email_select_tag(:recipients)
   .form-actions

app/views/admin/geo_nodes/_form.html.haml

 = form_for geo_node, as: :geo_node, url: admin_geo_nodes_path, html: { class: 'form-horizontal' } do |f|
-  -if geo_node.errors.any?
+  - if geo_node.errors.any?
     .alert.alert-danger
       - geo_node.errors.full_messages.each do |msg|
         %p= msg

app/views/admin/geo_nodes/index.html.haml

@@ -10,7 +10,7 @@
 
 = render :partial => 'form', locals: {geo_node: @node} if Gitlab::Geo.license_allows?
 
--if @nodes.any?
+- if @nodes.any?
   .panel.panel-default
     .panel-heading
       Geo nodes (#{@nodes.count})

app/views/admin/licenses/_breakdown.html.haml

@@ -26,7 +26,7 @@
             #{@license.expires_at}
           \.
         The
-        %a{href: 'https://about.gitlab.com/license-faq/'}true-up model
+        %a{ href: 'https://about.gitlab.com/license-faq/' } true-up model
         allows having more users, and additional users will incur a retroactive charge on renewal.
     .col-sm-4
       .light-well
@@ -43,7 +43,7 @@
           %h1.center= number_with_delimiter users_over_license
         %hr
           The
-          %a{href: 'https://about.gitlab.com/license-faq/'}true-up model
+          %a{ href: 'https://about.gitlab.com/license-faq/' } true-up model
           has a retroactive charge for these users at the next renewal. If you want to update your
           license sooner to prevent this, please contact
           #{mail_to 'sales@gitlab.com'}.

app/views/admin/push_rules/show.html.haml

@@ -7,7 +7,7 @@
 %hr.clearfix
 
 = form_for [:admin, @push_rule] do |f|
-  -if @push_rule.errors.any?
+  - if @push_rule.errors.any?
     .alert.alert-danger
       - @push_rule.errors.full_messages.each do |msg|
         %p= msg

app/views/devise/shared/_signin_box.html.haml

@@ -5,7 +5,7 @@
         = render 'devise/sessions/new_crowd'
 
   - if kerberos_enabled?
-    .login-box.tab-pane{id: "kerberos", role: 'tabpanel', class: (:active unless crowd_enabled? || ldap_enabled?)}
+    .login-box.tab-pane{ id: "kerberos", role: 'tabpanel', class: (:active unless crowd_enabled? || ldap_enabled?) }
       .login-body
         = render 'devise/sessions/new_kerberos'
 

app/views/devise/shared/_tabs_ldap.html.haml

@@ -3,7 +3,7 @@
     %li.active
       = link_to "Crowd", "#crowd", 'data-toggle' => 'tab'
   - if kerberos_enabled?
-    %li{class: (:active unless crowd_enabled? || ldap_enabled?)}
+    %li{ class: (:active unless crowd_enabled? || ldap_enabled?) }
       = link_to "Kerberos", "#kerberos", 'data-toggle' => 'tab'
   - @ldap_servers.each_with_index do |server, i|
     %li{ class: (:active if i.zero? && !crowd_enabled?) }

app/views/groups/analytics/show.html.haml

@@ -6,7 +6,7 @@
 .sub-header-block
   .pull-right
     .dropdown.inline
-      %button.dropdown-toggle.btn{type: 'button', 'data-toggle' => 'dropdown'}
+      %button.dropdown-toggle.btn{ type: 'button', 'data-toggle' => 'dropdown' }
         = icon('calendar-o')
         %b.caret
       %ul.dropdown-menu.dropdown-menu-align-right
@@ -41,7 +41,7 @@
   .col-md-8
     %div
       %p.light Push events per group member
-      %canvas#push{height: 250}
+      %canvas#push{ height: 250 }
 
 %h3 Merge Requests
 
@@ -58,7 +58,7 @@
   .col-md-8
     %div
       %p.light Merge requests created per group member
-      %canvas#merge_requests{height: 250}
+      %canvas#merge_requests{ height: 250 }
 
 %h3 Issues
 
@@ -75,7 +75,7 @@
   .col-md-8
     %div
       %p.light Issues closed per group member
-      %canvas#issues{height: 250}
+      %canvas#issues{ height: 250 }
 
 .gray-content-block
   .oneline

app/views/ldap_group_links/_ldap_group_links.html.haml

 .panel.panel-default
   .panel-heading
     %h4.panel-title
-      Linked LDAP groups
-      == (#{group.ldap_group_links.count})
+      Linked LDAP groups (#{group.ldap_group_links.count})
 
   - if group.ldap_group_links.any?
     %ul.well-list

app/views/notify/add_merge_request_approver_email.html.haml

@@ -12,5 +12,5 @@
   %p
     Approvers: #{render_items_list(@merge_request.approvers_left.map(&:name))}
 
--if @merge_request.description
+- if @merge_request.description
   = markdown(@merge_request.description, pipeline: :email, author: @merge_request.author)

app/views/notify/send_admin_notification.html.haml

@@ -4,4 +4,4 @@
 
 %p
   Don't want to receive updates from GitLab administrators?
-  = link_to 'Unsubscribe', @unsubscribe_url
\ No newline at end of file
+  = link_to 'Unsubscribe', @unsubscribe_url

app/views/notify/send_admin_notification.text.haml

@@ -3,4 +3,4 @@
 \-----
 
 Don't want to receive updates from GitLab administrators?
-== Unsubscribe here: #{@unsubscribe_url}
\ No newline at end of file
+Unsubscribe here: #{@unsubscribe_url}

app/views/projects/branches/_branch.html.haml

@@ -21,7 +21,7 @@
         protected
 
     - if @project.mirror_ever_updated_successfully? && @repository.diverged_from_upstream?(branch.name)
-      %span.label.label-danger.has-tooltip{data: { html: "true", title: branch_diverged_tooltip_message }}
+      %span.label.label-danger.has-tooltip{ data: { html: "true", title: branch_diverged_tooltip_message } }
         = icon('exclamation-triangle')
         diverged from upstream
 

app/views/projects/buttons/_update_mirror.html.haml

@@ -2,21 +2,21 @@
   - if !@project.has_remote_mirror? && @project.mirror?
     - size = nil unless defined?(size) && size
     - if @project.updating_mirror?
-      %span.btn.disabled.update-mirror-button.has-tooltip{title: "Updating from upstream..."}
+      %span.btn.disabled.update-mirror-button.has-tooltip{ title: "Updating from upstream..." }
         = icon('refresh')
     - else
       = link_to update_now_namespace_project_mirror_path(@project.namespace, @project), method: :post, class: "btn update-mirror-button has-tooltip", title: "Update from upstream" do
         = icon('refresh')
   - elsif @project.has_remote_mirror? && !@project.mirror?
     - if @project.updating_remote_mirror?
-      %span.btn.disabled.update-mirror-button.has-tooltip{title: "Updating remote repository..."}
+      %span.btn.disabled.update-mirror-button.has-tooltip{ title: "Updating remote repository..." }
         = icon('refresh')
     - else
       = link_to update_now_namespace_project_mirror_path(@project.namespace, @project, sync_remote: true), method: :post, class: "btn update-mirror-button has-tooltip", title: "Update remote repository" do
         = icon('refresh')
   - elsif @project.has_remote_mirror? && @project.mirror?
     .btn-group
-      %a.btn.dropdown-toggle{href: '#', 'data-toggle' => 'dropdown'}
+      %a.btn.dropdown-toggle{ href: '#', 'data-toggle' => 'dropdown' }
         = icon('refresh')
       %ul.dropdown-menu.dropdown-menu-right
         %li

app/views/projects/commits/_mirror_status.html.haml

@@ -7,7 +7,7 @@
       = render "shared/mirror_status"
 
       - if @ref.present? && @project.mirror_ever_updated_successfully? && @repository.diverged_from_upstream?(@ref)
-        %span.has-tooltip{data: { html: "true", title: branch_diverged_tooltip_message }}
+        %span.has-tooltip{ data: { html: "true", title: branch_diverged_tooltip_message } }
           = icon('exclamation-triangle')
           This branch has diverged from upstream.
     .project-mirror-button

app/views/projects/merge_requests/widget/open/_approve.html.haml

-%div
-  %h4
-    = render_require_section(@merge_request)
-    
-  - if @merge_request.can_approve?(current_user)
-    .append-bottom-10
-      = form_for [:approve, @project.namespace.becomes(Namespace), @project, @merge_request], method: :post do |f|
-        = f.submit "Approve Merge Request", class: "btn btn-primary approve-btn"
+%div
+  %h4
+    = render_require_section(@merge_request)
+  - if @merge_request.can_approve?(current_user)
+    .append-bottom-10
+      = form_for [:approve, @project.namespace.becomes(Namespace), @project, @merge_request], method: :post do |f|
+        = f.submit "Approve Merge Request", class: "btn btn-primary approve-btn"

app/views/search/_category.html.haml

@@ -70,12 +70,12 @@
         %span.badge
           = @search_results.milestones_count
     - if current_application_settings.elasticsearch_search?
-      %li{class: ("active" if @scope == 'blobs')}
+      %li{ class: ("active" if @scope == 'blobs') }
         = link_to search_filter_path(scope: 'blobs') do
           Code
           %span.badge
             = @search_results.blobs_count
-      %li{class: ("active" if @scope == 'commits')}
+      %li{ class: ("active" if @scope == 'commits') }
         = link_to search_filter_path(scope: 'commits') do
           Commits
           %span.badge

app/views/shared/issuable/_approvals.html.haml

@@ -42,7 +42,7 @@
           - unsaved_approvers = !issuable.approvers_overwritten?
           - item_classes = unsaved_approvers ? ['unsaved-approvers'] : []
           - issuable.overall_approvers.each do |approver|
-            %li{id: dom_id(approver.user), class: item_classes + ['approver']}
+            %li{ id: dom_id(approver.user), class: item_classes + ['approver'] }
               = link_to approver.user.name, approver.user
               .pull-right
                 - if unsaved_approvers
@@ -54,7 +54,7 @@
                     = icon("sign-out")
                     Remove
           - issuable.overall_approver_groups.each do |approver_group|
-            %li{id: dom_id(approver_group.group), class: item_classes + ['approver-group']}
+            %li{ id: dom_id(approver_group.group), class: item_classes + ['approver-group'] }
               Group:
               = link_to approver_group.group.name, approver_group.group
               .pull-right

app/views/shared/issuable/_filter.html.haml

@@ -38,7 +38,7 @@
               %ul
                 - Issue.weight_filter_options.each do |weight|
                   %li
-                    %a{href: "#", data: { id: weight }, class: ("is-active" if params[:weight] == weight.to_s)}
+                    %a{ href: "#", data: { id: weight }, class: ("is-active" if params[:weight] == weight.to_s) }
                       = weight
 
         - if issuable_filter_present?

app/views/shared/issuable/_form.html.haml

@@ -81,7 +81,7 @@
                                                                                                   method: :delete, class: 'btn btn-danger btn-grouped'
       = link_to 'Cancel', polymorphic_path([@project.namespace.becomes(Namespace), @project, issuable]), class: 'btn btn-grouped btn-cancel'
 
-%li.unsaved-approvers.hide.approver.approver-template{id: "user_{user_id}"}
+%li.unsaved-approvers.hide.approver.approver-template{ id: "user_{user_id}" }
   = link_to "{approver_name}", "#"
   .pull-right
     = link_to "#", data: { confirm: "Are you sure you want to remove approver {approver_name}"}, class: "btn-xs btn btn-remove", title: 'Remove approver' do

app/views/shared/issuable/_sidebar.html.haml

@@ -76,7 +76,7 @@
           = dropdown_tag('Milestone', options: { title: 'Assign milestone', toggle_class: 'js-milestone-select js-extra-options', filter: true, dropdown_class: 'dropdown-menu-selectable', placeholder: 'Search milestones', data: { show_no: true, field_name: "#{issuable.to_ability_name}[milestone_id]", project_id: @project.id, issuable_id: issuable.id, milestones: namespace_project_milestones_path(@project.namespace, @project, :json), ability_name: issuable.to_ability_name, issue_update: issuable_json_path(issuable), use_id: true }})
       - if issuable.has_attribute?(:time_estimate)
         #issuable-time-tracker.block
-          %issuable-time-tracker{ ':time_estimate' => 'issuable.time_estimate', ':time_spent' => 'issuable.total_time_spent', ':human_time_estimate' => 'issuable.human_time_estimate', ':human_time_spent' => 'issuable.human_total_time_spent', 'stopwatch-svg' => custom_icon('icon_stopwatch'), 'docs-url' => help_page_path('workflow/time_tracking.md')}
+          %issuable-time-tracker{ ':time_estimate' => 'issuable.time_estimate', ':time_spent' => 'issuable.total_time_spent', ':human_time_estimate' => 'issuable.human_time_estimate', ':human_time_spent' => 'issuable.human_total_time_spent', 'stopwatch-svg' => custom_icon('icon_stopwatch'), 'docs-url' => help_page_path('workflow/time_tracking.md') }
             // Fallback while content is loading
             .title.hide-collapsed
               Time tracking