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

This commit is contained in:
Tom Hughes 2020-08-10 18:11:09 +01:00
commit e1da786c99

View file

@ -106,7 +106,7 @@ GEM
debug_inspector (>= 0.0.1) debug_inspector (>= 0.0.1)
bootsnap (1.4.7) bootsnap (1.4.7)
msgpack (~> 1.0) msgpack (~> 1.0)
bootstrap (4.5.0) bootstrap (4.5.2)
autoprefixer-rails (>= 9.1.0) autoprefixer-rails (>= 9.1.0)
popper_js (>= 1.14.3, < 2) popper_js (>= 1.14.3, < 2)
sassc-rails (>= 2.0.0) sassc-rails (>= 2.0.0)
@ -133,7 +133,7 @@ GEM
coderay (1.1.3) coderay (1.1.3)
composite_primary_keys (12.0.2) composite_primary_keys (12.0.2)
activerecord (~> 6.0.0) activerecord (~> 6.0.0)
concurrent-ruby (1.1.6) concurrent-ruby (1.1.7)
config (2.2.1) config (2.2.1)
deep_merge (~> 1.2, >= 1.2.1) deep_merge (~> 1.2, >= 1.2.1)
dry-validation (~> 1.0, >= 1.0.0) dry-validation (~> 1.0, >= 1.0.0)