Enable the Layout/ExtraSpacing cop

Signed-off-by: Rémy Coutable <remy@rymai.me>

app/views/projects/_issuable_by_email.html.haml

@@ -21,7 +21,7 @@
             = clipboard_button(target: '#issuable_email', class: 'btn btn-clipboard input-group-text btn-transparent d-none d-sm-block')
             - if issuable_type == 'issue'
-              - enter_title_text =  _('Enter the issue title')
+              - enter_title_text = _('Enter the issue title')
               - enter_description_text = _('Enter the issue description')
             - else
               - enter_title_text = _('Enter the merge request title')

app/views/projects/_new_project_fields.html.haml

@@ -43,7 +43,7 @@
   = f.label :description, class: 'label-bold' do
     Project description
     %span (optional)
-  = f.text_area :description, placeholder: 'Description format',  class: "form-control", rows: 3, maxlength: 250, data: { track_label: "#{track_label}", track_event: "activate_form_input", track_property: "project_description", track_value: "" }
+  = f.text_area :description, placeholder: 'Description format', class: "form-control", rows: 3, maxlength: 250, data: { track_label: "#{track_label}", track_event: "activate_form_input", track_property: "project_description", track_value: "" }
 = f.label :visibility_level, class: 'label-bold' do
   Visibility Level

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

@@ -35,8 +35,8 @@
       - elsif can_collaborate_with_project?(@project)
         %li= link_to _('New file'), project_new_blob_path(@project, @project.default_branch || 'master')
       - elsif create_mr_from_new_fork
-        - continue_params = { to:         project_new_blob_path(@project, @project.default_branch || 'master'),
-                              notice:     edit_in_new_fork_notice,
+        - continue_params = { to: project_new_blob_path(@project, @project.default_branch || 'master'),
+                              notice: edit_in_new_fork_notice,
                               notice_now: edit_in_new_fork_notice_now }
         - fork_path = project_forks_path(@project, namespace_key: current_user.namespace.id, continue: continue_params)
         %li= link_to _('New file'), fork_path, method: :post

app/views/projects/commit/_commit_box.html.haml

@@ -49,7 +49,7 @@
           #{ _('Download') }
         - unless @commit.parents.length > 1
           %li= link_to s_("DownloadCommit|Email Patches"), project_commit_path(@project, @commit, format: :patch), class: "qa-email-patches"
-        %li= link_to s_("DownloadCommit|Plain Diff"),    project_commit_path(@project, @commit, format: :diff), class: "qa-plain-diff"
+        %li= link_to s_("DownloadCommit|Plain Diff"), project_commit_path(@project, @commit, format: :diff), class: "qa-plain-diff"
 .commit-box{ data: { project_path: project_path(@project) } }
   %h3.commit-title

app/views/projects/issues/_merge_requests.html.haml

@@ -19,7 +19,7 @@
                 = render partial: 'projects/issues/merge_requests_status', locals: { merge_request: merge_request, css_class: 'd-none d-xl-block append-right-8' }
                 = link_to merge_request.title, merge_request_path(merge_request), { class: 'mr-title-link'}
               .item-meta
-                = render partial: 'projects/issues/merge_requests_status', locals: { merge_request: merge_request,  css_class: 'd-xl-none d-lg-block append-right-5' }
+                = render partial: 'projects/issues/merge_requests_status', locals: { merge_request: merge_request, css_class: 'd-xl-none d-lg-block append-right-5' }
                 %span.d-flex.align-items-center.append-right-8.mr-item-path.item-path-id.mt-0
                   %span.path-id-text.bold.text-truncate{ data: { toggle: 'tooltip'}, title: merge_request.target_project.full_path }
                     = merge_request.target_project.full_path

app/views/projects/issues/_merge_requests_status.html.haml

@@ -18,5 +18,5 @@
 - mr_status_tooltip = "<div><span class=\"bold\">#{mr_status_title}</span> #{time_ago_in_words(mr_status_date)} ago</div><span class=\"text-tertiary\">#{l(mr_status_date.to_time, format: time_format)}</span>"
-%span.mr-status-wrapper.suggestion-help-hover{ class: css_class, data: { toggle: 'tooltip', placement: 'bottom', html: 'true', title:  mr_status_tooltip } }
+%span.mr-status-wrapper.suggestion-help-hover{ class: css_class, data: { toggle: 'tooltip', placement: 'bottom', html: 'true', title: mr_status_tooltip } }
   = sprite_icon(mr_status_icon, size: 16, css_class: "merge-request-status #{mr_status_class}")

app/views/projects/issues/_new_branch.html.haml

@@ -30,7 +30,7 @@
                 = icon('check', class: 'icon')
                 = _('Create merge request and branch')
-          %li{ class: [!can_create_merge_request && 'droplab-item-selected'], role: 'button', data: {  value: 'create-branch', text: _('Create branch') } }
+          %li{ class: [!can_create_merge_request && 'droplab-item-selected'], role: 'button', data: { value: 'create-branch', text: _('Create branch') } }
             .menu-item
               = icon('check', class: 'icon')
               = _('Create branch')

app/views/projects/milestones/_form.html.haml

 = form_for [@project.namespace.becomes(Namespace), @project, @milestone],
-           html: {class: 'milestone-form common-note-form js-quick-submit js-requires-input'},
-           data: { markdown_version: @milestone.cached_markdown_version }  do |f|
+           html: { class: 'milestone-form common-note-form js-quick-submit js-requires-input' },
+           data: { markdown_version: @milestone.cached_markdown_version } do |f|
   = form_errors(@milestone)
   .row
     .col-md-6

app/views/projects/pipeline_schedules/_form.html.haml

@@ -34,7 +34,7 @@
             = n_('Reveal value', 'Reveal values', @schedule.variables.size)
   .form-group.row
     .col-md-9
-      = f.label  :active, s_('PipelineSchedules|Activated'), class: 'label-bold'
+      = f.label :active, s_('PipelineSchedules|Activated'), class: 'label-bold'
       %div
         = f.check_box :active, required: false, value: @schedule.active?
         = _('Active')

app/views/projects/project_members/_team.html.haml

@@ -6,7 +6,7 @@
     %span.flex-project-title
       = _("Members of <strong>%{project_name}</strong>").html_safe % { project_name: sanitize_project_name(project.name) }
     %span.badge.badge-pill= members.total_count
-    = form_tag project_project_members_path(project), method: :get, class: 'form-inline member-search-form flex-project-members-form'  do
+    = form_tag project_project_members_path(project), method: :get, class: 'form-inline member-search-form flex-project-members-form' do
       .form-group
         .position-relative
           = search_field_tag :search, params[:search], { placeholder: _('Find existing members by name'), class: 'form-control', spellcheck: false }

app/views/projects/project_templates/_built_in_templates.html.haml

@@ -12,6 +12,6 @@
       %a.btn.btn-default.append-right-10{ href: template.preview, rel: 'noopener noreferrer', target: '_blank', data: { track_label: "create_from_template", track_property: "template_preview", track_event: "click_button", track_value: template.name } }
         = _("Preview")
       %label.btn.btn-success.template-button.choose-template.append-bottom-0{ for: template.name }
-        %input{ type: "radio",  autocomplete: "off", name: "project[template_name]", id: template.name, value: template.name, data: { track_label: "create_from_template", track_property: "template_use", track_event: "click_button" } }
+        %input{ type: "radio", autocomplete: "off", name: "project[template_name]", id: template.name, value: template.name, data: { track_label: "create_from_template", track_property: "template_use", track_event: "click_button" } }
         %span
           = _("Use template")

app/views/projects/serverless/functions/index.html.haml

@@ -5,7 +5,7 @@
 - status_path = project_serverless_functions_path(@project, format: :json)
 - clusters_path = project_clusters_path(@project)
-.serverless-functions-page.js-serverless-functions-page{ data: { status_path: status_path, installed: @installed,  clusters_path: clusters_path, help_path: help_page_path('user/project/clusters/serverless/index') } }
+.serverless-functions-page.js-serverless-functions-page{ data: { status_path: status_path, installed: @installed, clusters_path: clusters_path, help_path: help_page_path('user/project/clusters/serverless/index') } }
 %div{ class: [container_class, ('limit-container-width' unless fluid_layout)] }
   .js-serverless-functions-notice

app/views/projects/tree/_tree_header.html.haml

@@ -40,27 +40,24 @@
                     #{ _('New directory') }
               - elsif can?(current_user, :fork_project, @project) && can?(current_user, :create_merge_request_in, @project)
                 %li
-                  - continue_params = { to:         project_new_blob_path(@project, @id),
-                                        notice:     edit_in_new_fork_notice,
+                  - continue_params = { to: project_new_blob_path(@project, @id),
+                                        notice: edit_in_new_fork_notice,
                                         notice_now: edit_in_new_fork_notice_now }
-                  - fork_path = project_forks_path(@project, namespace_key:  current_user.namespace.id,
-                                                                                          continue:       continue_params)
+                  - fork_path = project_forks_path(@project, namespace_key: current_user.namespace.id, continue: continue_params)
                   = link_to fork_path, method: :post do
                     #{ _('New file') }
                 %li
-                  - continue_params = { to:         request.fullpath,
-                                        notice:     edit_in_new_fork_notice + " Try to upload a file again.",
+                  - continue_params = { to: request.fullpath,
+                                        notice: edit_in_new_fork_notice + " Try to upload a file again.",
                                         notice_now: edit_in_new_fork_notice_now }
-                  - fork_path = project_forks_path(@project, namespace_key:  current_user.namespace.id,
-                                                                                          continue:       continue_params)
+                  - fork_path = project_forks_path(@project, namespace_key: current_user.namespace.id, continue: continue_params)
                   = link_to fork_path, method: :post do
                     #{ _('Upload file') }
                 %li
-                  - continue_params = { to:         request.fullpath,
-                                        notice:     edit_in_new_fork_notice + " Try to create a new directory again.",
+                  - continue_params = { to: request.fullpath,
+                                        notice: edit_in_new_fork_notice + " Try to create a new directory again.",
                                         notice_now: edit_in_new_fork_notice_now }
-                  - fork_path = project_forks_path(@project, namespace_key:  current_user.namespace.id,
-                                                                                          continue:       continue_params)
+                  - fork_path = project_forks_path(@project, namespace_key: current_user.namespace.id, continue: continue_params)
                   = link_to fork_path, method: :post do
                     #{ _('New directory') }

app/views/shared/boards/components/_sidebar.html.haml

-%board-sidebar{ "inline-template" => true,  ":current-user" => (UserSerializer.new.represent(current_user) || {}).to_json }
+%board-sidebar{ "inline-template" => true, ":current-user" => (UserSerializer.new.represent(current_user) || {}).to_json }
   %transition{ name: "boards-sidebar-slide" }
     %aside.right-sidebar.right-sidebar-expanded.issue-boards-sidebar{ "v-show" => "showSidebar" }
       .issuable-sidebar

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

@@ -2,7 +2,7 @@
 %aside.issues-bulk-update.js-right-sidebar.right-sidebar{ "aria-live" => "polite", data: { 'signed-in': current_user.present? } }
   .issuable-sidebar.hidden
-    = form_tag [:bulk_update, @project.namespace.becomes(Namespace), @project, type], method: :post, class: "bulk-update"  do
+    = form_tag [:bulk_update, @project.namespace.becomes(Namespace), @project, type], method: :post, class: "bulk-update" do
       .block.issuable-sidebar-header
         .filter-item.inline.update-issues-btn.float-left
           = button_tag "Update all", class: "btn update-selected-issues btn-info", disabled: true
@@ -50,4 +50,3 @@
       = hidden_field_tag "update[issuable_ids]", []
       = hidden_field_tag :state_event, params[:state_event]
-

app/workers/namespaceless_project_destroy_worker.rb

@@ -17,7 +17,7 @@ class NamespacelessProjectDestroyWorker
       return
     end
-    return if project.namespace  # Reject doing anything for projects that *do* have a namespace
+    return if project.namespace # Reject doing anything for projects that *do* have a namespace
     project.team.truncate

config.ru

@@ -19,7 +19,7 @@ if defined?(Unicorn)
   Unicorn::StreamInput.send(:public, :eof?) # rubocop:disable GitlabSecurity/PublicSend
 end
-require ::File.expand_path('../config/environment',  __FILE__)
+require ::File.expand_path('../config/environment', __FILE__)
 warmup do |app|
   client = Rack::MockRequest.new(app)

config/initializers/8_devise.rb

@@ -178,7 +178,7 @@ Devise.setup do |config|
   # Configure the default scope given to Warden. By default it's the first
   # devise role declared in your routes (usually :user).
-  config.default_scope = :user  # now have an :email scope as well, so set the default
+  config.default_scope = :user # now have an :email scope as well, so set the default
   # Configure sign_out behavior.
   # Sign_out action can be scoped (i.e. /users/sign_out affects only :user scope).

config/initializers/doorkeeper_openid_connect.rb

@@ -31,7 +31,7 @@ Doorkeeper::OpenidConnect.configure do
       o.claim(:name)           { |user| user.name }
       o.claim(:nickname)       { |user| user.username }
-      o.claim(:email)          { |user| user.public_email  }
+      o.claim(:email)          { |user| user.public_email }
       o.claim(:email_verified) { |user| true if user.public_email? }
       o.claim(:website)        { |user| user.full_website_url if user.website_url? }
       o.claim(:profile)        { |user| Gitlab::Routing.url_helpers.user_url user }

config/initializers/postgresql_cte.rb

@@ -108,7 +108,7 @@ module ActiveRecord
         when String
           with_value
         when Hash
-          with_value.map  do |name, expression|
+          with_value.map do |name, expression|
             case expression
             when String
               select = Arel::Nodes::SqlLiteral.new "(#{expression})"