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

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

Browse source
This commit is contained in:
Tom Hughes 2022-03-30 23:59:40 +01:00
commit b45635dbdc
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -144,7 +144,7 @@ group :test do
gem "erb_lint", :require => false gem "erb_lint", :require => false
gem "factory_bot_rails" gem "factory_bot_rails"
gem "minitest", "~> 5.1" gem "minitest", "~> 5.1"
gem "puma", "~> 5.3" gem "puma", "~> 5.6"
gem "rails-controller-testing" gem "rails-controller-testing"
gem "rubocop" gem "rubocop"
gem "rubocop-minitest" gem "rubocop-minitest"

4
Gemfile.lock
View file

@ -362,7 +362,7 @@ GEM
popper_js (1.16.0) popper_js (1.16.0)
progress (3.6.0) progress (3.6.0)
public_suffix (4.0.6) public_suffix (4.0.6)
puma (5.6.2) puma (5.6.4)
nio4r (~> 2.0) nio4r (~> 2.0)
quad_tile (1.0.1) quad_tile (1.0.1)
r2 (0.2.7) r2 (0.2.7)
@ -569,7 +569,7 @@ DEPENDENCIES
omniauth-windowslive omniauth-windowslive
openstreetmap-deadlock_retry (>= 1.3.1) openstreetmap-deadlock_retry (>= 1.3.1)
pg pg
puma (~> 5.3) puma (~> 5.6)
quad_tile (~> 1.0.1) quad_tile (~> 1.0.1)
r2 (~> 0.2.7) r2 (~> 0.2.7)
rack-cors rack-cors