summaryrefslogtreecommitdiffstats
path: root/Gemfile
diff options
context:
space:
mode:
authorGo MAEDA <maeda@farend.jp>2019-12-11 14:09:01 +0000
committerGo MAEDA <maeda@farend.jp>2019-12-11 14:09:01 +0000
commit669c3c206b9f435cd639d308dfd31099fd8d1698 (patch)
tree25ff38fafbe45fd3cc29fdb5198b69141f363da5 /Gemfile
parentc3474a96b22ded58e556cc290d804b25b3e6279a (diff)
downloadredmine-669c3c206b9f435cd639d308dfd31099fd8d1698.tar.gz
redmine-669c3c206b9f435cd639d308dfd31099fd8d1698.zip
Merged r19358 from trunk to 3.4-stable (#32592).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@19361 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index 502e8676a..68b1b433c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -96,7 +96,7 @@ end
group :test do
gem "minitest"
gem "rails-dom-testing"
- gem "mocha"
+ gem 'mocha', '>= 1.4.0'
gem "simplecov", "~> 0.9.1", :require => false
# TODO: remove this after upgrading to Rails 5
gem "test_after_commit", "~> 0.4.2"