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

[rails.git] / Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index 6896a07f81f1ef0efa680ca56115f28d122c5ba9..0dd07a95e03c4d403e6c052a2d98892ab3a8c7fd 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -58,15 +58,16 @@ GEM
     ast (2.4.0)
     autoprefixer-rails (8.6.5)
       execjs
-    better_errors (2.5.0)
+    better_errors (2.5.1)
       coderay (>= 1.0.0)
       erubi (>= 1.0.0)
       rack (>= 0.9.0)
     bigdecimal (1.1.0)
     binding_of_caller (0.8.0)
       debug_inspector (>= 0.0.1)
-    bootsnap (1.3.2)
+    bootsnap (1.4.0)
       msgpack (~> 1.0)
+    browser (2.5.3)
     builder (3.2.3)
     cancancan (2.3.0)
     canonical-rails (0.2.5)
@@ -111,13 +112,13 @@ GEM
     dynamic_form (1.1.4)
     erubi (1.8.0)
     execjs (2.7.0)
-    exifr (1.3.5)
-    factory_bot (4.11.1)
-      activesupport (>= 3.0.0)
-    factory_bot_rails (4.11.1)
-      factory_bot (~> 4.11.1)
-      railties (>= 3.0.0)
-    fakefs (0.18.1)
+    exifr (1.3.6)
+    factory_bot (5.0.0)
+      activesupport (>= 4.2.0)
+    factory_bot_rails (5.0.1)
+      factory_bot (~> 5.0.0)
+      railties (>= 4.2.0)
+    fakefs (0.19.1)
     faraday (0.15.4)
       multipart-post (>= 1.2, < 3)
     ffi (1.9.25)
@@ -164,7 +165,7 @@ GEM
       jsonify (< 0.4.0)
     jwt (2.1.0)
     kgio (2.11.2)
-    kramdown (1.17.0)
+    kramdown (2.1.0)
     libv8 (3.16.14.19)
     libxml-ruby (3.1.0)
     listen (3.1.5)
@@ -313,7 +314,7 @@ GEM
     rinku (2.0.4)
     rotp (4.0.2)
       addressable (~> 2.5)
-    rubocop (0.63.1)
+    rubocop (0.64.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.5, != 2.5.1.1)
@@ -394,6 +395,7 @@ DEPENDENCIES
   bigdecimal (~> 1.1.0)
   binding_of_caller
   bootsnap (>= 1.1.0)
+  browser
   cancancan
   canonical-rails
   capybara (~> 2.13)
@@ -444,7 +446,7 @@ DEPENDENCIES
   rails-controller-testing
   rails-i18n (~> 4.0.0)
   record_tag_helper
-  rinku (>= 1.2.2)
+  rinku (= 2.0.4)
   rotp
   rubocop
   sanitize