From: Go MAEDA <maeda@farend.jp>
Date: Thu, 3 Nov 2022 03:53:13 +0000 (+0000)
Subject: Merged r21945 from trunk to 5.0-stable (#37883).
X-Git-Tag: 5.0.4~13
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=8277c7bf3a220ec7ae71dd1764c5cfa44e2d5cb1;p=redmine.git

Merged r21945 from trunk to 5.0-stable (#37883).


git-svn-id: https://svn.redmine.org/redmine/branches/5.0-stable@21946 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/Gemfile b/Gemfile
index d1d03eda2..b0f723f85 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.21.2', :require => false
   gem "ffi", platforms: [:mingw, :x64_mingw, :mswin]
   # For running system tests