aboutsummaryrefslogtreecommitdiffstats
path: root/lib/bundler/definition.rb
diff options
context:
space:
mode:
authorhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-12-11 03:07:37 +0000
committerhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-12-11 03:07:37 +0000
commit91533d9ab17a08385381d87991e01e8674e069a1 (patch)
treed12a91bc6cf5a524712a87e94a99345983f4806b /lib/bundler/definition.rb
parent448e86d796b67d4535c2443f379031ace3388f60 (diff)
downloadruby-91533d9ab17a08385381d87991e01e8674e069a1.tar.gz
Downgrade Bundler 1.17.x from 2.0.0.
We have the platform issue on heroku: * https://gist.github.com/schneems/26452540f6e2bbbcf2ea144f45f6b305 * https://github.com/heroku/heroku-buildpack-ruby/issues/833 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66323 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/bundler/definition.rb')
-rw-r--r--lib/bundler/definition.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/bundler/definition.rb b/lib/bundler/definition.rb
index c5e94c7123..8e56d4a9bc 100644
--- a/lib/bundler/definition.rb
+++ b/lib/bundler/definition.rb
@@ -331,7 +331,7 @@ module Bundler
# i.e., Windows with `git config core.autocrlf=true`
contents.gsub!(/\n/, "\r\n") if @lockfile_contents.match("\r\n")
- if @locked_bundler_version && Bundler.feature_flag.lockfile_upgrade_warning?
+ if @locked_bundler_version
locked_major = @locked_bundler_version.segments.first
current_major = Gem::Version.create(Bundler::VERSION).segments.first