From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Thu, 1 May 2014 12:27:28 +0000 (+0000)
Subject: Merged r13117 from trunk to 2.5-stable (#16685)
X-Git-Tag: 2.5.2~34
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=cd67b1b02a25e5a480e8ab1fa96acf107bb62775;p=redmine.git

Merged r13117 from trunk to 2.5-stable (#16685)

Gemfile: upgrade mocha version.

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

diff --git a/Gemfile b/Gemfile
index 86c1bd6f3..b5ce92849 100644
--- a/Gemfile
+++ b/Gemfile
@@ -87,7 +87,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"