From: Go MAEDA <maeda@farend.jp>
Date: Sun, 26 Jan 2020 01:16:19 +0000 (+0000)
Subject: Merged r19461 from trunk to 4.0-stable (#32788).
X-Git-Tag: 4.0.7~17
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=bc6101f97f7e96b05d883c30066f84f7daeec96c;p=redmine.git

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


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

diff --git a/Gemfile b/Gemfile
index 20348b2fb..abae74c39 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-ruby '>= 2.3.0', '< 2.7.0'
+ruby '>= 2.3.0', '< 2.7.0' if Bundler::VERSION >= '1.12.0'
 gem "bundler", ">= 1.5.0"
 
 gem "rails", "5.2.4.1"