From: Go MAEDA <maeda@farend.jp>
Date: Mon, 31 Oct 2022 03:39:01 +0000 (+0000)
Subject: Merged r21934 from trunk to 5.0-stable (#37867).
X-Git-Tag: 5.0.4~15
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=ce4cce347420ba6aecd944d0d3eb3650ee06702e;p=redmine.git

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


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

diff --git a/Gemfile b/Gemfile
index d58cd62fe..d1d03eda2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -97,7 +97,8 @@ group :test do
   gem 'simplecov', '~> 0.21.2', :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', (Gem.ruby_version < Gem::Version.new('2.6.0') ? '~> 3.35.3' : '~> 3.36.0')
   gem "selenium-webdriver", "~> 3.142.7"
   gem 'webdrivers', '4.6.1', require: false