From: Tom Hughes <tom@compton.nu>
Date: Wed, 16 Nov 2022 18:14:38 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/3799'
X-Git-Tag: live~1501
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/961ed61247ea2a865cce488e81db8d93aa04a6c4?hp=63c1ade01a70afe87493fb774e691273e5bb222d

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

diff --git a/Gemfile b/Gemfile
index 020cc9166..81ba4a9a3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,7 @@
 source "https://rubygems.org"
 
 # Require rails
-gem "rails", "7.0.4"
+gem "rails", "~> 7.0.0"
 
 # Require json for multi_json
 gem "json"
diff --git a/Gemfile.lock b/Gemfile.lock
index 68a973c47..586f2000d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -573,7 +573,7 @@ DEPENDENCIES
   r2 (~> 0.2.7)
   rack-cors
   rack-uri_sanitizer
-  rails (= 7.0.4)
+  rails (~> 7.0.0)
   rails-controller-testing
   rails-i18n (~> 7.0.0)
   rinku (>= 2.0.6)