From 2fc24a44fe379b786753cd66eebc2a23a8d3ce6c Mon Sep 17 00:00:00 2001
From: Go MAEDA <maeda@farend.jp>
Date: Tue, 17 Jan 2023 00:23:48 +0000
Subject: [PATCH] Drop Ruby 2.6 support (#38134).

git-svn-id: https://svn.redmine.org/redmine/trunk@22053 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 Gemfile     | 10 +++++-----
 doc/INSTALL |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Gemfile b/Gemfile
index fae6b60e3..44f448396 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-ruby '>= 2.6.0', '< 3.3.0'
+ruby '>= 2.7.0', '< 3.3.0'
 
 gem 'rails', '6.1.7'
 gem 'rouge', '~> 3.30.0'
@@ -10,7 +10,7 @@ gem "actionpack-xml_parser"
 gem 'roadie-rails', '~> 3.0.0'
 gem 'marcel'
 gem "mail", "~> 2.7.1"
-gem 'nokogiri', (Gem.ruby_version < Gem::Version.new('2.7') ? '~> 1.13.10' : '~> 1.14.0')
+gem 'nokogiri', '~> 1.14.0'
 gem 'i18n', '~> 1.12.0'
 gem "rbpdf", "~> 1.20.0"
 gem 'addressable'
@@ -94,12 +94,12 @@ end
 
 group :test do
   gem "rails-dom-testing"
-  gem 'mocha', (Gem.ruby_version < Gem::Version.new('2.7.0') ? ['>= 1.4.0', '< 2.0.0'] : '>= 1.4.0')
+  gem 'mocha', '>= 1.4.0'
   gem 'simplecov', '~> 0.22.0', :require => false
   gem "ffi", platforms: [:mingw, :x64_mingw, :mswin]
   # For running system tests
-  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 'puma'
+  gem 'capybara', '~> 3.38.0'
   gem "selenium-webdriver", "~> 3.142.7"
   gem 'webdrivers', '4.6.1', require: false
   # RuboCop
diff --git a/doc/INSTALL b/doc/INSTALL
index 3fc33a3d3..1487b8317 100644
--- a/doc/INSTALL
+++ b/doc/INSTALL
@@ -7,7 +7,7 @@ http://www.redmine.org/
 
 == Requirements
 
-* Ruby 2.6, 2.7, 3.0, 3.1, 3.2
+* Ruby 2.7, 3.0, 3.1, 3.2
 
 * A database:
   * MySQL (tested with MySQL 5.7)
-- 
2.39.5