Skip to content

Commit b86ec86

Browse files
authored
Merge pull request #525 from Shopify/dependabot/bundler/rubocop-1.50.0
Bump rubocop from 1.49.0 to 1.50.0
2 parents c141acf + 75a595d commit b86ec86

File tree

4 files changed

+10
-7
lines changed

4 files changed

+10
-7
lines changed

Gemfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ PATH
22
remote: .
33
specs:
44
rubocop-shopify (2.12.0)
5-
rubocop (~> 1.49)
5+
rubocop (~> 1.50)
66

77
GEM
88
remote: https://rubygems.org/
@@ -27,7 +27,7 @@ GEM
2727
rake (13.0.6)
2828
regexp_parser (2.7.0)
2929
rexml (3.2.5)
30-
rubocop (1.49.0)
30+
rubocop (1.50.0)
3131
json (~> 2.3)
3232
parallel (~> 1.10)
3333
parser (>= 3.2.0.0)

rubocop-shopify.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,5 @@ Gem::Specification.new do |s|
2323

2424
s.required_ruby_version = ">= 2.7.0"
2525

26-
s.add_dependency("rubocop", "~> 1.49")
26+
s.add_dependency("rubocop", "~> 1.50")
2727
end

rubocop.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,9 @@ Lint/DuplicateElsifCondition:
131131
Lint/DuplicateMagicComment:
132132
Enabled: true
133133

134+
Lint/DuplicateMatchPattern:
135+
Enabled: true
136+
134137
Lint/DuplicateRegexpCharacterClassElement:
135138
Enabled: false
136139

test/fixtures/full_config.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -682,8 +682,6 @@ Layout/LineContinuationLeadingSpace:
682682
Layout/LineContinuationSpacing:
683683
Description: Checks the spacing in front of backslash in line continuations.
684684
Enabled: false
685-
AutoCorrect: true
686-
SafeAutoCorrect: true
687685
VersionAdded: '1.31'
688686
EnforcedStyle: space
689687
SupportedStyles:
@@ -1245,6 +1243,10 @@ Lint/DuplicateMagicComment:
12451243
Description: Check for duplicated magic comments.
12461244
Enabled: true
12471245
VersionAdded: '1.37'
1246+
Lint/DuplicateMatchPattern:
1247+
Description: Do not repeat patterns in `in` keywords.
1248+
Enabled: true
1249+
VersionAdded: '1.50'
12481250
Lint/DuplicateMethods:
12491251
Description: Check for duplicate method definitions.
12501252
Enabled: true
@@ -2785,7 +2787,6 @@ Style/FileEmpty:
27852787
is empty.
27862788
Enabled: true
27872789
Safe: false
2788-
SafeAutoCorrect: false
27892790
VersionAdded: '1.48'
27902791
Style/FileRead:
27912792
Description: Favor `File.(bin)read` convenience methods.
@@ -3434,7 +3435,6 @@ Style/NumericPredicate:
34343435
comparisons.
34353436
StyleGuide: "#predicate-methods"
34363437
Safe: false
3437-
SafeAutoCorrect: false
34383438
Enabled: false
34393439
VersionAdded: '0.42'
34403440
VersionChanged: '0.59'

0 commit comments

Comments
 (0)