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

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

Browse source
This commit is contained in:
Tom Hughes 2024-05-08 18:19:07 +01:00
commit a551cd737f
2 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -131,7 +131,7 @@ gem "gd2-ffij", ">= 0.4.0"
gem "marcel" gem "marcel"
# Used for browser detection # Used for browser detection
gem "browser" gem "browser", "< 6" # for ruby 3.0 support
# Used for S3 object storage # Used for S3 object storage
gem "aws-sdk-s3" gem "aws-sdk-s3"

7
Gemfile.lock
View file

@ -136,7 +136,7 @@ GEM
brakeman (6.1.2) brakeman (6.1.2)
racc racc
brotli (0.5.0) brotli (0.5.0)
browser (6.0.0) browser (5.3.1)
builder (3.2.4) builder (3.2.4)
bzip2-ffi (1.1.1) bzip2-ffi (1.1.1)
ffi (~> 1.0) ffi (~> 1.0)
@ -336,8 +336,7 @@ GEM
minitest (>= 4, < 6) minitest (>= 4, < 6)
msgpack (1.7.2) msgpack (1.7.2)
multi_json (1.15.0) multi_json (1.15.0)
multi_xml (0.7.1) multi_xml (0.6.0)
bigdecimal (~> 3.1)
mutex_m (0.2.0) mutex_m (0.2.0)
net-http (0.4.1) net-http (0.4.1)
uri uri
@ -613,7 +612,7 @@ DEPENDENCIES
bootstrap (~> 5.3.2) bootstrap (~> 5.3.2)
bootstrap_form (~> 5.0) bootstrap_form (~> 5.0)
brakeman brakeman
browser browser (< 6)
bzip2-ffi bzip2-ffi
cancancan cancancan
canonical-rails canonical-rails