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

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

diff --git a/Gemfile b/Gemfile
index 155265dbbeadec83d52174db2eb942b279bb5eb9..f0489c77be919c11efe796e76d0088abaa2de90e 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 2213887fa652aa48c9e4ec6d377614642257e35a..25a15164135fbf4baa97ba070fccb1fa9ecbe587 100644 (file)
--- a/doc/INSTALL
+++ b/doc/INSTALL
@@ -7,7 +7,7 @@ http://www.redmine.org/
 
 == Requirements
 
-* Ruby >= 2.3
+* Ruby 2.3, 2.4, 2.5, 2.6
 * RubyGems
 * Bundler >= 1.5.0