summaryrefslogtreecommitdiffstats
path: root/Gemfile
diff options
context:
space:
mode:
authorGo MAEDA <maeda@farend.jp>2022-11-03 03:55:20 +0000
committerGo MAEDA <maeda@farend.jp>2022-11-03 03:55:20 +0000
commit9b18c03cda8a976b57d478febedff58aaaf1eea2 (patch)
tree9c72c2e20c5ba554a4362a18ba8694a074ebce3a /Gemfile
parent47fff4f95b5de54428fa021f7d8ad69327716ece (diff)
downloadredmine-9b18c03cda8a976b57d478febedff58aaaf1eea2.tar.gz
redmine-9b18c03cda8a976b57d478febedff58aaaf1eea2.zip
Merged r21945 from trunk to 4.2-stable (#37883).
git-svn-id: https://svn.redmine.org/redmine/branches/4.2-stable@21947 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 15f9dbb11..e47ced7d8 100644
--- a/Gemfile
+++ b/Gemfile
@@ -93,7 +93,7 @@ end
group :test do
gem "rails-dom-testing"
- gem 'mocha', '>= 1.4.0'
+ gem 'mocha', (Gem.ruby_version < Gem::Version.new('2.7.0') ? ['>= 1.4.0', '< 2.0.0'] : '>= 1.4.0')
gem 'simplecov', '~> 0.18.5', :require => false
gem "ffi", platforms: [:mingw, :x64_mingw, :mswin]
# For running system tests