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

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

Browse source
This commit is contained in:
Tom Hughes 2020-06-28 18:42:18 +01:00
commit 45c599b1b0
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -143,7 +143,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", "~> 3.11" gem "puma", "~> 4.3"
gem "rails-controller-testing" gem "rails-controller-testing"
gem "rubocop" gem "rubocop"
gem "rubocop-minitest" gem "rubocop-minitest"

5
Gemfile.lock
View file

@ -328,7 +328,8 @@ GEM
progress (3.5.2) progress (3.5.2)
psych (3.1.0) psych (3.1.0)
public_suffix (4.0.5) public_suffix (4.0.5)
puma (3.12.6) puma (4.3.5)
nio4r (~> 2.0)
quad_tile (1.0.1) quad_tile (1.0.1)
r2 (0.2.7) r2 (0.2.7)
rack (2.2.3) rack (2.2.3)
@ -526,7 +527,7 @@ DEPENDENCIES
openstreetmap-deadlock_retry (>= 1.3.0) openstreetmap-deadlock_retry (>= 1.3.0)
pg pg
psych psych
puma (~> 3.11) puma (~> 4.3)
quad_tile (~> 1.0.1) quad_tile (~> 1.0.1)
r2 (~> 0.2.7) r2 (~> 0.2.7)
rack-cors rack-cors