Commit 7b68bdce authored by Rémy Coutable's avatar Rémy Coutable

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

Enable Layout/TrailingWhitespace cop and auto-correct offenses

See merge request !13573
parents 1b46a836 142b9ec4
...@@ -251,6 +251,10 @@ Layout/Tab: ...@@ -251,6 +251,10 @@ Layout/Tab:
Layout/TrailingBlankLines: Layout/TrailingBlankLines:
Enabled: true Enabled: true
# Avoid trailing whitespace.
Layout/TrailingWhitespace:
Enabled: true
# Style ####################################################################### # Style #######################################################################
# Check the naming of accessor methods for get_/set_. # Check the naming of accessor methods for get_/set_.
......
...@@ -57,11 +57,6 @@ Layout/SpaceInsideParens: ...@@ -57,11 +57,6 @@ Layout/SpaceInsideParens:
Layout/SpaceInsidePercentLiteralDelimiters: Layout/SpaceInsidePercentLiteralDelimiters:
Enabled: false Enabled: false
# Offense count: 89
# Cop supports --auto-correct.
Layout/TrailingWhitespace:
Enabled: false
# Offense count: 272 # Offense count: 272
RSpec/EmptyLineAfterFinalLet: RSpec/EmptyLineAfterFinalLet:
Enabled: false Enabled: false
......
module Gitlab module Gitlab
module ImportExport module ImportExport
class AttributesFinder class AttributesFinder
def initialize(included_attributes:, excluded_attributes:, methods:) def initialize(included_attributes:, excluded_attributes:, methods:)
@included_attributes = included_attributes || {} @included_attributes = included_attributes || {}
@excluded_attributes = excluded_attributes || {} @excluded_attributes = excluded_attributes || {}
......
...@@ -8,7 +8,6 @@ describe Projects::ServicesController, '(JavaScript fixtures)', type: :controlle ...@@ -8,7 +8,6 @@ describe Projects::ServicesController, '(JavaScript fixtures)', type: :controlle
let(:project) { create(:project_empty_repo, namespace: namespace, path: 'services-project') } let(:project) { create(:project_empty_repo, namespace: namespace, path: 'services-project') }
let!(:service) { create(:custom_issue_tracker_service, project: project, title: 'Custom Issue Tracker') } let!(:service) { create(:custom_issue_tracker_service, project: project, title: 'Custom Issue Tracker') }
render_views render_views
before(:all) do before(:all) do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment