cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Tom Hughes 2020-10-09 08:21:07 +01:00
commit 5ea7425edd
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Gemfile.lock
View file

@ -325,7 +325,7 @@ GEM
omniauth-oauth2 (~> 1.4) omniauth-oauth2 (~> 1.4)
openstreetmap-deadlock_retry (1.3.0) openstreetmap-deadlock_retry (1.3.0)
parallel (1.19.2) parallel (1.19.2)
parser (2.7.1.5) parser (2.7.2.0)
ast (~> 2.4.1) ast (~> 2.4.1)
pg (1.2.3) pg (1.2.3)
popper_js (1.16.0) popper_js (1.16.0)
@ -389,13 +389,13 @@ GEM
rexml (3.2.4) rexml (3.2.4)
rinku (2.0.6) rinku (2.0.6)
rotp (6.2.0) rotp (6.2.0)
rubocop (0.92.0) rubocop (0.93.0)
parallel (~> 1.10) parallel (~> 1.10)
parser (>= 2.7.1.5) parser (>= 2.7.1.5)
rainbow (>= 2.2.2, < 4.0) rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 1.7) regexp_parser (>= 1.8)
rexml rexml
rubocop-ast (>= 0.5.0) rubocop-ast (>= 0.6.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.7.1) rubocop-ast (0.7.1)