summaryrefslogtreecommitdiffstats
path: root/Gemfile
diff options
context:
space:
mode:
authorGo MAEDA <maeda@farend.jp>2023-01-02 05:38:02 +0000
committerGo MAEDA <maeda@farend.jp>2023-01-02 05:38:02 +0000
commit50f84c20b8235cd065fc30461e7b6957113def3c (patch)
treec52017bd3d66cb616e74049f9e509ecfbfbfb941 /Gemfile
parent24920aaa06b3d6173352228efef7075b34de36e7 (diff)
downloadredmine-50f84c20b8235cd065fc30461e7b6957113def3c.tar.gz
redmine-50f84c20b8235cd065fc30461e7b6957113def3c.zip
Merged r22011 from trunk to 5.0-stable (#38135).
git-svn-id: https://svn.redmine.org/redmine/branches/5.0-stable@22017 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile11
1 files changed, 8 insertions, 3 deletions
diff --git a/Gemfile b/Gemfile
index 88158dcda..739de9aae 100644
--- a/Gemfile
+++ b/Gemfile
@@ -97,9 +97,14 @@ group :test do
gem 'simplecov', '~> 0.21.2', :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', (Gem.ruby_version < Gem::Version.new('2.6.0') ? '~> 3.35.3' : '~> 3.36.0')
+ gem 'puma', (Gem.ruby_version < Gem::Version.new('2.7') ? '< 6.0.0' : '>= 0')
+ gem 'capybara', (if Gem.ruby_version < Gem::Version.new('2.6')
+ '~> 3.35.3'
+ elsif Gem.ruby_version < Gem::Version.new('2.7')
+ '~> 3.36.0'
+ else
+ '~> 3.38.0'
+ end)
gem "selenium-webdriver", "~> 3.142.7"
gem 'webdrivers', '4.6.1', require: false
# RuboCop