Drop support for Bundler prior to 1.12.0 (#32841).

Patch by Go MAEDA.

git-svn-id: http://svn.redmine.org/redmine/trunk@19468 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/Gemfile b/Gemfile
index bcc58ee358e2861cd01ac24ef70f15118c8cdb31..2dba4f77eb219bd05279fd866c4c85ef9fc76bd9 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 
-ruby '>= 2.3.0', '< 2.7.0' if Bundler::VERSION >= '1.12.0'
-gem "bundler", ">= 1.5.0"
+ruby '>= 2.3.0', '< 2.7.0'
+gem 'bundler', '>= 1.12.0'
 
 gem "rails", "5.2.4.1"
 gem 'sprockets', '~> 3.7.2' if RUBY_VERSION < '2.5'

diff --git a/doc/INSTALL b/doc/INSTALL
index 49dd6e28517d6c2b57b99f1710c91b508cb3d61a..0c57edb39dfdaf0dcd7f307108fc0c80f3c567b0 100644 (file)
--- a/doc/INSTALL
+++ b/doc/INSTALL
@@ -8,7 +8,7 @@ http://www.redmine.org/
 == Requirements
 
 * Ruby 2.3, 2.4, 2.5, 2.6
-* Bundler >= 1.5.0
+* Bundler >= 1.12.0
 
 * A database:
   * MySQL (tested with MySQL 5.7)