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

[rails.git] / Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index 53fb236918afe7a37af85d031aabc9cfed0646ca..17dd71611f3dd7f3edaa91d4368b80b3281f8cb6 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -67,6 +67,7 @@ GEM
       debug_inspector (>= 0.0.1)
     bootsnap (1.3.2)
       msgpack (~> 1.0)
+    browser (2.5.3)
     builder (3.2.3)
     cancancan (2.3.0)
     canonical-rails (0.2.5)
@@ -164,7 +165,7 @@ GEM
       jsonify (< 0.4.0)
     jwt (2.1.0)
     kgio (2.11.2)
-    kramdown (2.0.0)
+    kramdown (1.17.0)
     libv8 (3.16.14.19)
     libxml-ruby (3.1.0)
     listen (3.1.5)
@@ -394,6 +395,7 @@ DEPENDENCIES
   bigdecimal (~> 1.1.0)
   binding_of_caller
   bootsnap (>= 1.1.0)
+  browser
   cancancan
   canonical-rails
   capybara (~> 2.13)