Skip to content

Commit

Permalink
Merge pull request Shopify#397 from Shopify/dependabot/bundler/ruboco…
Browse files Browse the repository at this point in the history
…p-shopify-2.1.0

Bump rubocop-shopify from 2.0.1 to 2.1.0
  • Loading branch information
etiennebarrie authored Apr 26, 2021
2 parents eea95ad + 5f48da5 commit 1738783
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 21 deletions.
6 changes: 0 additions & 6 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,3 @@ Style/DocumentationMethod:
Include:
- app/**/*.rb
- lib/**/*.rb

Style/SymbolArray:
EnforcedStyle: brackets

Style/WordArray:
EnforcedStyle: brackets
10 changes: 5 additions & 5 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ GEM
nokogiri (1.11.2-x86_64-linux)
racc (~> 1.4)
parallel (1.20.1)
parser (3.0.0.0)
parser (3.0.1.0)
ast (~> 2.4.1)
pry (0.13.1)
coderay (~> 1.1)
Expand Down Expand Up @@ -158,8 +158,8 @@ GEM
rainbow (3.0.0)
rake (13.0.3)
regexp_parser (2.1.1)
rexml (3.2.4)
rubocop (1.12.0)
rexml (3.2.5)
rubocop (1.13.0)
parallel (~> 1.10)
parser (>= 3.0.0.0)
rainbow (>= 2.2.2, < 4.0)
Expand All @@ -170,8 +170,8 @@ GEM
unicode-display_width (>= 1.4.0, < 3.0)
rubocop-ast (1.4.1)
parser (>= 2.7.1.5)
rubocop-shopify (2.0.1)
rubocop (~> 1.11)
rubocop-shopify (2.1.0)
rubocop (~> 1.13)
ruby-progressbar (1.11.0)
rubyzip (2.3.0)
selenium-webdriver (3.142.7)
Expand Down
10 changes: 5 additions & 5 deletions gemfiles/rails_6_0.gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ GEM
nokogiri (1.11.2-x86_64-linux)
racc (~> 1.4)
parallel (1.20.1)
parser (3.0.0.0)
parser (3.0.1.0)
ast (~> 2.4.1)
pry (0.13.1)
coderay (~> 1.1)
Expand Down Expand Up @@ -154,8 +154,8 @@ GEM
rainbow (3.0.0)
rake (13.0.3)
regexp_parser (2.1.1)
rexml (3.2.4)
rubocop (1.12.0)
rexml (3.2.5)
rubocop (1.13.0)
parallel (~> 1.10)
parser (>= 3.0.0.0)
rainbow (>= 2.2.2, < 4.0)
Expand All @@ -166,8 +166,8 @@ GEM
unicode-display_width (>= 1.4.0, < 3.0)
rubocop-ast (1.4.1)
parser (>= 2.7.1.5)
rubocop-shopify (2.0.1)
rubocop (~> 1.11)
rubocop-shopify (2.1.0)
rubocop (~> 1.13)
ruby-progressbar (1.11.0)
rubyzip (2.3.0)
selenium-webdriver (3.142.7)
Expand Down
10 changes: 5 additions & 5 deletions gemfiles/rails_edge.gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ GEM
nokogiri (1.11.2-x86_64-linux)
racc (~> 1.4)
parallel (1.20.1)
parser (3.0.0.0)
parser (3.0.1.0)
ast (~> 2.4.1)
pry (0.13.1)
coderay (~> 1.1)
Expand All @@ -163,8 +163,8 @@ GEM
rainbow (3.0.0)
rake (13.0.3)
regexp_parser (2.1.1)
rexml (3.2.4)
rubocop (1.12.0)
rexml (3.2.5)
rubocop (1.13.0)
parallel (~> 1.10)
parser (>= 3.0.0.0)
rainbow (>= 2.2.2, < 4.0)
Expand All @@ -175,8 +175,8 @@ GEM
unicode-display_width (>= 1.4.0, < 3.0)
rubocop-ast (1.4.1)
parser (>= 2.7.1.5)
rubocop-shopify (2.0.1)
rubocop (~> 1.11)
rubocop-shopify (2.1.0)
rubocop (~> 1.13)
ruby-progressbar (1.11.0)
rubyzip (2.3.0)
selenium-webdriver (3.142.7)
Expand Down

0 comments on commit 1738783

Please sign in to comment.