From 66e5b9d3f47cd52143be0e6a216ade34bb52b9cc Mon Sep 17 00:00:00 2001
From: Akira Matsuda <ronnie@dio.jp>
Date: Sun, 15 Jan 2017 22:56:58 +0900
Subject: bundle u mocha

I see no reason not to use the newest stable version.
---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index f529677fbb..7aaf4f5f05 100644
--- a/Gemfile
+++ b/Gemfile
@@ -14,7 +14,7 @@ gem "rake", ">= 11.1"
 
 # This needs to be with require false to ensure correct loading order, as it has to
 # be loaded after loading the test library.
-gem "mocha", "~> 0.14", require: false
+gem "mocha", require: false
 
 gem "rack-cache", "~> 1.2"
 gem "jquery-rails"
diff --git a/Gemfile.lock b/Gemfile.lock
index 94d538b84b..4fa856b198 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -229,7 +229,7 @@ GEM
     mime-types-data (3.2016.0521)
     mini_portile2 (2.1.0)
     minitest (5.3.3)
-    mocha (0.14.0)
+    mocha (1.2.1)
       metaclass (~> 0.0.1)
     mono_logger (1.1.0)
     multi_json (1.12.1)
@@ -399,7 +399,7 @@ DEPENDENCIES
   libxml-ruby
   listen (>= 3.0.5, < 3.2)
   minitest (< 5.3.4)
-  mocha (~> 0.14)
+  mocha
   mysql2 (>= 0.4.4)
   nokogiri (>= 1.6.8)
   pg (>= 0.18.0)
-- 
cgit v1.2.3