Merge branch 'rs-trailingwhitespace-cop' into 'master'

Enable Layout/TrailingWhitespace cop and auto-correct offenses See merge request !13573

Merge branch 'rs-trailingwhitespace-cop' into 'master'
Enable Layout/TrailingWhitespace cop and auto-correct offenses See merge request !13573
7b68bdce · Rémy Coutable · 1b46a836 · 142b9ec4 · 7b68bdce · 7b68bdce
Commit 7b68bdce authored Aug 16, 2017 by Rémy Coutable
38 changed files
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -251,6 +251,10 @@ Layout/Tab:
 Layout/TrailingBlankLines:
  Enabled: true

+# Avoid trailing whitespace.
+Layout/TrailingWhitespace:
+  Enabled: true
+
 # Style #######################################################################

 # Check the naming of accessor methods for get_/set_.

--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -57,11 +57,6 @@ Layout/SpaceInsideParens:
 Layout/SpaceInsidePercentLiteralDelimiters:
  Enabled: false

-# Offense count: 89
-# Cop supports --auto-correct.
-Layout/TrailingWhitespace:
-  Enabled: false
-
 # Offense count: 272
 RSpec/EmptyLineAfterFinalLet:
  Enabled: false

--- a/app/controllers/groups/application_controller.rb
+++ b/app/controllers/groups/application_controller.rb
--- a/app/controllers/omniauth_callbacks_controller.rb
+++ b/app/controllers/omniauth_callbacks_controller.rb
--- a/app/controllers/projects/cycle_analytics/events_controller.rb
+++ b/app/controllers/projects/cycle_analytics/events_controller.rb
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
--- a/app/helpers/pipeline_schedules_helper.rb
+++ b/app/helpers/pipeline_schedules_helper.rb
--- a/app/models/blob_viewer/notebook.rb
+++ b/app/models/blob_viewer/notebook.rb
--- a/app/models/deploy_keys_project.rb
+++ b/app/models/deploy_keys_project.rb
--- a/app/models/redirect_route.rb
+++ b/app/models/redirect_route.rb
--- a/app/serializers/project_entity.rb
+++ b/app/serializers/project_entity.rb
--- a/config/initializers/0_acts_as_taggable.rb
+++ b/config/initializers/0_acts_as_taggable.rb
--- a/config/initializers/static_files.rb
+++ b/config/initializers/static_files.rb
--- a/config/initializers/trusted_proxies.rb
+++ b/config/initializers/trusted_proxies.rb
--- a/config/routes/repository.rb
+++ b/config/routes/repository.rb
--- a/db/migrate/20161020075830_default_request_access_projects.rb
+++ b/db/migrate/20161020075830_default_request_access_projects.rb
--- a/db/post_migrate/20170503004427_update_retried_for_ci_build.rb
+++ b/db/post_migrate/20170503004427_update_retried_for_ci_build.rb
--- a/db/post_migrate/20170523083112_migrate_old_artifacts.rb
+++ b/db/post_migrate/20170523083112_migrate_old_artifacts.rb
--- a/features/steps/profile/emails.rb
+++ b/features/steps/profile/emails.rb
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
--- a/lib/api/protected_branches.rb
+++ b/lib/api/protected_branches.rb
--- a/lib/banzai/filter/image_lazy_load_filter.rb
+++ b/lib/banzai/filter/image_lazy_load_filter.rb
--- a/lib/constraints/project_url_constrainer.rb
+++ b/lib/constraints/project_url_constrainer.rb
--- a/lib/declarative_policy/base.rb
+++ b/lib/declarative_policy/base.rb
--- a/lib/gitlab/auth/ip_rate_limiter.rb
+++ b/lib/gitlab/auth/ip_rate_limiter.rb
--- a/lib/gitlab/ci/build/artifacts/metadata.rb
+++ b/lib/gitlab/ci/build/artifacts/metadata.rb
--- a/lib/gitlab/git/blob.rb
+++ b/lib/gitlab/git/blob.rb
--- a/lib/gitlab/import_export/attributes_finder.rb
+++ b/lib/gitlab/import_export/attributes_finder.rb
 module Gitlab
  module ImportExport
    class AttributesFinder
-    
      def initialize(included_attributes:, excluded_attributes:, methods:)
        @included_attributes = included_attributes || {}
        @excluded_attributes = excluded_attributes || {}

--- a/lib/gitlab/ldap/auth_hash.rb
+++ b/lib/gitlab/ldap/auth_hash.rb
--- a/lib/gitlab/middleware/rails_queue_duration.rb
+++ b/lib/gitlab/middleware/rails_queue_duration.rb
--- a/lib/gitlab/slash_commands/presenters/help.rb
+++ b/lib/gitlab/slash_commands/presenters/help.rb
--- a/lib/tasks/gitlab/gitaly.rake
+++ b/lib/tasks/gitlab/gitaly.rake
--- a/spec/features/admin/admin_settings_spec.rb
+++ b/spec/features/admin/admin_settings_spec.rb
--- a/spec/features/issues_spec.rb
+++ b/spec/features/issues_spec.rb
--- a/spec/features/milestones/show_spec.rb
+++ b/spec/features/milestones/show_spec.rb
--- a/spec/features/projects/files/undo_template_spec.rb
+++ b/spec/features/projects/files/undo_template_spec.rb
--- a/spec/javascripts/fixtures/prometheus_service.rb
+++ b/spec/javascripts/fixtures/prometheus_service.rb
--- a/spec/javascripts/fixtures/services.rb
+++ b/spec/javascripts/fixtures/services.rb
@@ -8,7 +8,6 @@ describe Projects::ServicesController, '(JavaScript fixtures)', type: :controlle
  let(:project)   { create(:project_empty_repo, namespace: namespace, path: 'services-project') }
  let!(:service)  { create(:custom_issue_tracker_service, project: project, title: 'Custom Issue Tracker') }

-
  render_views

  before(:all) do