aboutsummaryrefslogtreecommitdiffstats
path: root/Gemfile.lock
diff options
context:
space:
mode:
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock6
1 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 787631ada5..938b4a71cc 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -309,7 +309,7 @@ GEM
path_expander (~> 1.0)
minitest-server (1.0.4)
minitest (~> 5.0)
- mocha (0.14.0)
+ mocha (1.3.0)
metaclass (~> 0.0.1)
mono_logger (1.1.0)
msgpack (1.1.0)
@@ -490,7 +490,7 @@ DEPENDENCIES
blade-sauce_labs_plugin
bootsnap (>= 1.1.0)
byebug
- capybara (~> 2.13)
+ capybara (~> 2.15)
coffee-rails
dalli (>= 2.2.1)
delayed_job
@@ -506,7 +506,7 @@ DEPENDENCIES
listen (>= 3.0.5, < 3.2)
mini_magick
minitest-bisect
- mocha (~> 0.14)
+ mocha
mysql2 (>= 0.4.4)
nokogiri (>= 1.6.8)
pg (>= 0.18.0)