Skip to content

Commit

Permalink
Merge pull request #119 from chef/161
Browse files Browse the repository at this point in the history
Update to RuboCop 1.6.1
  • Loading branch information
tas50 committed Dec 21, 2020
2 parents 4beb765 + aaae60a commit 7ca143b
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
7 changes: 5 additions & 2 deletions config/upstream.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3209,9 +3209,10 @@ Style/ExponentialNotation:
Style/FloatDivision:
Description: 'For performing float division, coerce one side only.'
StyleGuide: '#float-division'
Reference: 'https://github.com/rubocop-hq/ruby-style-guide/issues/628'
Reference: 'https://blog.rubystyle.guide/ruby/2019/06/21/float-division.html'
Enabled: true
VersionAdded: '0.72'
VersionChanged: '1.6'
EnforcedStyle: single_coerce
SupportedStyles:
- left_coerce
Expand Down Expand Up @@ -4025,6 +4026,7 @@ Style/RedundantArgument:
Enabled: pending
Safe: false
VersionAdded: '1.4'
VersionChanged: '1.6'
Methods:
# Array#join
join: ''
Expand Down Expand Up @@ -4272,7 +4274,7 @@ Style/SingleLineBlockParams:
Description: 'Enforces the names of some block params.'
Enabled: false
VersionAdded: '0.16'
VersionChanged: '0.47'
VersionChanged: '1.6'
Methods:
- reduce:
- acc
Expand Down Expand Up @@ -4345,6 +4347,7 @@ Style/StringConcatenation:
Enabled: true
Safe: false
VersionAdded: '0.89'
VersionChanged: '1.6'

Style/StringHashKeys:
Description: 'Prefer symbols instead of strings as hash keys.'
Expand Down
2 changes: 1 addition & 1 deletion lib/chefstyle/version.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# frozen_string_literal: true
module Chefstyle
VERSION = "1.5.7"
RUBOCOP_VERSION = "1.5.2"
RUBOCOP_VERSION = "1.6.1"
end

0 comments on commit 7ca143b

Please sign in to comment.