summaryrefslogtreecommitdiffstats
path: root/Gemfile
diff options
context:
space:
mode:
authorGo MAEDA <maeda@farend.jp>2022-12-29 05:51:23 +0000
committerGo MAEDA <maeda@farend.jp>2022-12-29 05:51:23 +0000
commitb7078d78dd56218744c691bd68f89548a7bbfa9d (patch)
tree3b6fb6eee57f386dd4666c1739f6da65338face6 /Gemfile
parent4819950b75772f5d2b4b3db1c2d1395cdcdccce0 (diff)
downloadredmine-b7078d78dd56218744c691bd68f89548a7bbfa9d.tar.gz
redmine-b7078d78dd56218744c691bd68f89548a7bbfa9d.zip
Allow use of Puma 6.0.0 or later (#38135).
Capybara >= 3.39.0 supports Puma 6.0. git-svn-id: https://svn.redmine.org/redmine/trunk@22011 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile5
1 files changed, 2 insertions, 3 deletions
diff --git a/Gemfile b/Gemfile
index 02c12a186..372e57d65 100644
--- a/Gemfile
+++ b/Gemfile
@@ -98,9 +98,8 @@ group :test do
gem 'simplecov', '~> 0.22.0', :require => false
gem "ffi", platforms: [:mingw, :x64_mingw, :mswin]
# For running system tests
- # TODO: Remove version specification once Capybara supports Puma 6
- gem 'puma', '< 6.0.0'
- gem 'capybara', '~> 3.36.0'
+ gem 'puma', (Gem.ruby_version < Gem::Version.new('2.7') ? '< 6.0.0' : '>= 0')
+ gem 'capybara', (Gem.ruby_version < Gem::Version.new('2.7') ? '~> 3.36.0' : '~> 3.38.0')
gem "selenium-webdriver", "~> 3.142.7"
gem 'webdrivers', '4.6.1', require: false
# RuboCop