Merge remote-tracking branch 'upstream/pull/2830'

This commit is contained in:
Tom Hughes 2020-09-16 08:24:45 +01:00
commit e2fb582d24

View file

@ -399,13 +399,13 @@ GEM
rubocop-ast (>= 0.3.0, < 1.0) rubocop-ast (>= 0.3.0, < 1.0)
ruby-progressbar (~> 1.7) ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 2.0) unicode-display_width (>= 1.4.0, < 2.0)
rubocop-ast (0.3.0) rubocop-ast (0.4.0)
parser (>= 2.7.1.4) parser (>= 2.7.1.4)
rubocop-minitest (0.10.1) rubocop-minitest (0.10.1)
rubocop (>= 0.87) rubocop (>= 0.87)
rubocop-performance (1.8.0) rubocop-performance (1.8.0)
rubocop (>= 0.87.0) rubocop (>= 0.87.0)
rubocop-rails (2.8.0) rubocop-rails (2.8.1)
activesupport (>= 4.2.0) activesupport (>= 4.2.0)
rack (>= 1.1) rack (>= 1.1)
rubocop (>= 0.87.0) rubocop (>= 0.87.0)