From: Tom Hughes <tom@compton.nu>
Date: Fri, 27 Nov 2020 08:53:13 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/2984' into master
X-Git-Tag: live~2699
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/fcf868c4451910978849c4ab5e126dab24fbd696?hp=c6144501cd8e105656b74777060db052951ce0ec

Merge remote-tracking branch 'upstream/pull/2984' into master
---

diff --git a/Gemfile.lock b/Gemfile.lock
index 8b99e6628..3678ab6b2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -121,7 +121,7 @@ GEM
     cancancan (3.1.0)
     canonical-rails (0.2.9)
       rails (>= 4.1, < 6.1)
-    capybara (3.33.0)
+    capybara (3.34.0)
       addressable
       mini_mime (>= 0.1.3)
       nokogiri (~> 1.8)