Skip to content

Commit 21492fb

Browse files
authored
Merge pull request #698 from Shopify/dependabot/bundler/rubocop-1.73.1
Bump rubocop from 1.72.2 to 1.73.1
2 parents f2b5f58 + bc5c1e6 commit 21492fb

File tree

2 files changed

+14
-5
lines changed

2 files changed

+14
-5
lines changed

Gemfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ GEM
3131
rainbow (3.1.1)
3232
rake (13.2.1)
3333
regexp_parser (2.10.0)
34-
rubocop (1.72.2)
34+
rubocop (1.73.1)
3535
json (~> 2.3)
3636
language_server-protocol (~> 3.17.0.2)
3737
lint_roller (~> 1.1.0)
@@ -42,7 +42,7 @@ GEM
4242
rubocop-ast (>= 1.38.0, < 2.0)
4343
ruby-progressbar (~> 1.7)
4444
unicode-display_width (>= 2.4.0, < 4.0)
45-
rubocop-ast (1.38.0)
45+
rubocop-ast (1.38.1)
4646
parser (>= 3.3.1.0)
4747
ruby-progressbar (1.13.0)
4848
unicode-display_width (3.1.4)

test/fixtures/full_config.yml

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1489,6 +1489,7 @@ Lint/LambdaWithoutLiteralBlock:
14891489
Lint/LiteralAsCondition:
14901490
Description: Checks of literals used in conditions.
14911491
Enabled: false
1492+
AutoCorrect: contextual
14921493
VersionAdded: '0.51'
14931494
Lint/LiteralAssignmentInCondition:
14941495
Description: Checks for literal assignments in the conditions.
@@ -1658,9 +1659,8 @@ Lint/RedundantRegexpQuantifiers:
16581659
Lint/RedundantRequireStatement:
16591660
Description: Checks for unnecessary `require` statement.
16601661
Enabled: false
1661-
SafeAutoCorrect: false
16621662
VersionAdded: '0.76'
1663-
VersionChanged: '1.57'
1663+
VersionChanged: '1.73'
16641664
Lint/RedundantSafeNavigation:
16651665
Description: Checks for redundant safe navigation calls.
16661666
Enabled: false
@@ -2332,13 +2332,15 @@ Naming/VariableName:
23322332
StyleGuide: "#snake-case-symbols-methods-vars"
23332333
Enabled: false
23342334
VersionAdded: '0.50'
2335-
VersionChanged: '1.8'
2335+
VersionChanged: '1.73'
23362336
EnforcedStyle: snake_case
23372337
SupportedStyles:
23382338
- snake_case
23392339
- camelCase
23402340
AllowedIdentifiers: []
23412341
AllowedPatterns: []
2342+
ForbiddenIdentifiers: []
2343+
ForbiddenPatterns: []
23422344
Naming/VariableNumber:
23432345
Description: Use the configured style when numbering symbols, methods and variables.
23442346
StyleGuide: "#snake-case-symbols-methods-vars-with-numbers"
@@ -2933,6 +2935,8 @@ Style/EndlessMethod:
29332935
- allow_single_line
29342936
- allow_always
29352937
- disallow
2938+
- require_single_line
2939+
- require_always
29362940
Style/EnvHome:
29372941
Description: Checks for consistent usage of `ENV['HOME']`.
29382942
Enabled: false
@@ -3873,6 +3877,9 @@ Style/RedundantCondition:
38733877
Description: Checks for unnecessary conditional expressions.
38743878
Enabled: false
38753879
VersionAdded: '0.76'
3880+
VersionChanged: '1.73'
3881+
AllowedMethods:
3882+
- nonzero?
38763883
Style/RedundantConditional:
38773884
Description: Don't return true/false from a conditional.
38783885
Enabled: false
@@ -4371,6 +4378,7 @@ Style/TrailingCommaInArrayLiteral:
43714378
SupportedStylesForMultiline:
43724379
- comma
43734380
- consistent_comma
4381+
- diff_comma
43744382
- no_comma
43754383
Style/TrailingCommaInBlockArgs:
43764384
Description: Checks for useless trailing commas in block arguments.
@@ -4384,6 +4392,7 @@ Style/TrailingCommaInHashLiteral:
43844392
SupportedStylesForMultiline:
43854393
- comma
43864394
- consistent_comma
4395+
- diff_comma
43874396
- no_comma
43884397
VersionAdded: '0.53'
43894398
Style/TrailingMethodEndStatement:

0 commit comments

Comments
 (0)