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

[rails.git] / Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index 6896a07f81f1ef0efa680ca56115f28d122c5ba9..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)
       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)
     builder (3.2.3)
     cancancan (2.3.0)
     canonical-rails (0.2.5)


@@ -394,6 +395,7 @@ DEPENDENCIES
   bigdecimal (~> 1.1.0)
   binding_of_caller
   bootsnap (>= 1.1.0)
   bigdecimal (~> 1.1.0)
   binding_of_caller
   bootsnap (>= 1.1.0)

+  browser

   cancancan
   canonical-rails
   capybara (~> 2.13)
   cancancan
   canonical-rails
   capybara (~> 2.13)