Skip to content

Commit

Permalink
Merge pull request #37 from alphagov/enable-pending-cops
Browse files Browse the repository at this point in the history
Disable pending cops by default
  • Loading branch information
benthorner authored Apr 16, 2020
2 parents 2f9bb3e + 2292ea7 commit ed59245
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 16 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# 3.5.0

* Disable pending cops by default (#37)

# 3.4.0

* Add rubocop-rake cops (#32)
Expand Down
1 change: 1 addition & 0 deletions config/default.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
AllCops:
NewCops: disable
Exclude:
- 'bin/**'
- 'config.ru'
Expand Down
2 changes: 1 addition & 1 deletion config/gds-ruby-styleguide.yml
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ Layout/SpaceInsideParens:
Description: No spaces after ( or before ).
Enabled: true

Layout/Tab:
Layout/IndentationStyle:
Description: No hard tabs.
Enabled: true

Expand Down
4 changes: 0 additions & 4 deletions config/other-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,6 @@ Lint/EmptyInterpolation:
Description: 'Checks for empty string interpolation.'
Enabled: true

Lint/EndBlock:
Description: 'END blocks should not be placed inside method definitions.'
Enabled: true

Lint/EnsureReturn:
Description: 'Never use return in an ensure block.'
Enabled: true
Expand Down
9 changes: 0 additions & 9 deletions config/other-style.yml
Original file line number Diff line number Diff line change
Expand Up @@ -380,12 +380,3 @@ Style/WhileUntilModifier:

Style/FrozenStringLiteralComment:
Enabled: false

Style/HashEachMethods:
Enabled: true

Style/HashTransformKeys:
Enabled: true

Style/HashTransformValues:
Enabled: true
4 changes: 2 additions & 2 deletions rubocop-govuk.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

Gem::Specification.new do |spec|
spec.name = "rubocop-govuk"
spec.version = "3.4.0"
spec.version = "3.5.0"
spec.authors = ["Government Digital Service"]
spec.email = ["[email protected]"]

Expand All @@ -15,7 +15,7 @@ Gem::Specification.new do |spec|

spec.add_development_dependency "rake", "~> 13.0"

spec.add_dependency "rubocop", "0.81.0"
spec.add_dependency "rubocop", "0.82.0"
spec.add_dependency "rubocop-rails", "~> 2"
spec.add_dependency "rubocop-rake", "~> 0.5.1"
spec.add_dependency "rubocop-rspec", "~> 1.28"
Expand Down

0 comments on commit ed59245

Please sign in to comment.