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

diff --git a/Gemfile.lock b/Gemfile.lock
index a4bfd6a9e1b099f7e81134f823a338f13061318d..c28d43cc10cb3c19b221bce70cd73565423db177 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -241,7 +241,7 @@ GEM
       sprockets
     image_size (2.0.2)
     in_threads (1.5.4)
-    jbuilder (2.10.0)
+    jbuilder (2.10.1)
       activesupport (>= 5.0.0)
     jmespath (1.4.0)
     jquery-rails (4.4.0)