From: Tom Hughes Date: Tue, 1 Dec 2020 08:18:56 +0000 (+0000) Subject: Merge remote-tracking branch 'upstream/pull/2987' into master X-Git-Tag: live~2785 X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/aae3ccd7ba031beb19fbb5c105644970a348e356?ds=inline;hp=-c Merge remote-tracking branch 'upstream/pull/2987' into master --- aae3ccd7ba031beb19fbb5c105644970a348e356 diff --combined Gemfile.lock index d5be32119,73f51d519..9534ca4fb --- a/Gemfile.lock +++ b/Gemfile.lock @@@ -254,7 -254,7 +254,7 @@@ GE kramdown (2.3.0) rexml libxml-ruby (3.2.1) - listen (3.3.1) + listen (3.3.3) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) logstash-event (1.2.02) @@@ -325,7 -325,7 +325,7 @@@ multi_json (~> 1.12) omniauth-oauth2 (~> 1.4) openstreetmap-deadlock_retry (1.3.0) - parallel (1.20.0) + parallel (1.20.1) parser (2.7.2.0) ast (~> 2.4.1) pg (1.2.3) @@@ -399,11 -399,11 +399,11 @@@ rubocop-ast (>= 0.6.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 2.0) - rubocop-ast (1.1.1) + rubocop-ast (1.2.0) parser (>= 2.7.1.5) rubocop-minitest (0.10.1) rubocop (>= 0.87) - rubocop-performance (1.9.0) + rubocop-performance (1.9.1) rubocop (>= 0.90.0, < 2.0) rubocop-ast (>= 0.4.0) rubocop-rails (2.8.1)