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

diff --git a/Gemfile.lock b/Gemfile.lock
index ef02cf6e506921c5c82878bff04882e203a3a11c..a7d9fbf2897710301e2721466da112bd3657120a 100644 (file)
--- 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)