From: Go MAEDA <maeda@farend.jp>
Date: Mon, 31 Oct 2022 03:41:19 +0000 (+0000)
Subject: Merged r21934 from trunk to 4.2-stable (#37867).
X-Git-Tag: 4.2.9~9
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=47fff4f95b5de54428fa021f7d8ad69327716ece;p=redmine.git

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 f8f7a55cb..15f9dbb11 100644
--- 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