Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/pull/2846'
Browse files Browse the repository at this point in the history
  • Loading branch information
tomhughes committed Sep 21, 2020
2 parents 205d537 + 0b820a0 commit ab31e01
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions Gemfile.lock
Expand Up @@ -384,7 +384,7 @@ GEM
rb-fsevent (0.10.4)
rb-inotify (0.10.1)
ffi (~> 1.0)
regexp_parser (1.7.1)
regexp_parser (1.8.0)
request_store (1.5.0)
rack (>= 1.4)
rexml (3.2.4)
Expand All @@ -399,12 +399,13 @@ GEM
rubocop-ast (>= 0.4.0, < 1.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 2.0)
rubocop-ast (0.4.0)
rubocop-ast (0.4.2)
parser (>= 2.7.1.4)
rubocop-minitest (0.10.1)
rubocop (>= 0.87)
rubocop-performance (1.8.0)
rubocop-performance (1.8.1)
rubocop (>= 0.87.0)
rubocop-ast (>= 0.4.0)
rubocop-rails (2.8.1)
activesupport (>= 4.2.0)
rack (>= 1.1)
Expand Down

0 comments on commit ab31e01

Please sign in to comment.