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 d1d03eda243d86242a2f1a5afdbf7681b9522e96..b0f723f859c8b9eb7a1adae7e736c39560c0b681 100644 (file)
--- 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