Merged r21934 from trunk to 4.2-stable (#37867).

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

diff --git a/Gemfile b/Gemfile
index f8f7a55cbe96cad2710d333e966489775d22a4d5..15f9dbb114dab95ad6d6777972a9e649791a9053 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -97,7 +97,8 @@ group :test do
   gem 'simplecov', '~> 0.18.5', :require => false
   gem "ffi", platforms: [:mingw, :x64_mingw, :mswin]
   # For running system tests
-  gem 'puma'
+  # TODO: Remove version specification once Capybara supports Puma 6
+  gem 'puma', '< 6.0.0'
   gem 'capybara', '~> 3.31.0'
   gem "selenium-webdriver"
   gem 'webdrivers', '~> 4.4', require: false