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

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

Browse source
This commit is contained in:
Tom Hughes 2022-11-16 18:14:38 +00:00
commit 961ed61247
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -1,7 +1,7 @@
source "https://rubygems.org" source "https://rubygems.org"
# Require rails # Require rails
gem "rails", "7.0.4" gem "rails", "~> 7.0.0"
# Require json for multi_json # Require json for multi_json
gem "json" gem "json"

2
Gemfile.lock
View file

@ -573,7 +573,7 @@ DEPENDENCIES
r2 (~> 0.2.7) r2 (~> 0.2.7)
rack-cors rack-cors
rack-uri_sanitizer rack-uri_sanitizer
rails (= 7.0.4) rails (~> 7.0.0)
rails-controller-testing rails-controller-testing
rails-i18n (~> 7.0.0) rails-i18n (~> 7.0.0)
rinku (>= 2.0.6) rinku (>= 2.0.6)