Merged r19425 from trunk to 4.0-stable (#32788).

git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@19427 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/Gemfile b/Gemfile
index 80b3dc4027af92abac684fbede1fbf7bd2c1d5df..20348b2fbda1c41efa420c5b1809dd5e84f8e462 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -1,5 +1,6 @@
 source 'https://rubygems.org'
 
+ruby '>= 2.3.0', '< 2.7.0'
 gem "bundler", ">= 1.5.0"
 
 gem "rails", "5.2.4.1"

diff --git a/doc/INSTALL b/doc/INSTALL
index 60fdcb36722daf98eba157999b859977a8040ae3..4c0176e87575c241a43808ee3ab9cc88c13867d6 100644 (file)
--- a/doc/INSTALL
+++ b/doc/INSTALL
@@ -7,7 +7,7 @@ http://www.redmine.org/
 
 == Requirements
 
-* Ruby >= 2.2.2
+* Ruby 2.3, 2.4, 2.5, 2.6
 * RubyGems
 * Bundler >= 1.5.0