From 8e50e4940b96642707a63413a320c97598183b9e 2014-05-01 12:28:59
From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: 2014-05-01 12:28:59
Subject: [PATCH] Merged r13117 from trunk to 2.4-stable (#16685)

Gemfile: upgrade mocha version.

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@13119 e93f8b46-1217-0410-a6f0-8f06a7374b81

---

diff --git a/Gemfile b/Gemfile
index 37f0b66..434e947 100644
--- a/Gemfile
+++ b/Gemfile
@@ -79,7 +79,7 @@ end
 
 group :test do
   gem "shoulda", "~> 3.3.2"
-  gem "mocha", ">= 0.14", :require => 'mocha/api'
+  gem "mocha", "~> 1.0.0", :require => 'mocha/api'
   if RUBY_VERSION >= '1.9.3'
     gem "capybara", "~> 2.1.0"
     gem "selenium-webdriver"