diff options
| author | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-12-04 23:33:29 +0000 |
|---|---|---|
| committer | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-12-04 23:33:29 +0000 |
| commit | cfa6c55347d037b152a4b93a390c73dfee6dccbd (patch) | |
| tree | c8ae7d5d865894dcb7a5999199edc284d5e29df7 | |
| parent | 76d9da900a818a402af31cb4f929ad3d65bd4a88 (diff) | |
Merge 2-0-stable branch from bundler/bundler.
It's release version of Bundler 2
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66204 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | lib/bundler/version.rb | 2 | ||||
| -rw-r--r-- | spec/bundler/commands/inject_spec.rb | 2 | ||||
| -rw-r--r-- | spec/bundler/realworld/edgecases_spec.rb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/lib/bundler/version.rb b/lib/bundler/version.rb index bf6c477c92..da356fe50e 100644 --- a/lib/bundler/version.rb +++ b/lib/bundler/version.rb @@ -7,7 +7,7 @@ module Bundler # We're doing this because we might write tests that deal # with other versions of bundler and we are unsure how to # handle this better. - VERSION = "2.0.0.pre.2" unless defined?(::Bundler::VERSION) + VERSION = "2.0.0" unless defined?(::Bundler::VERSION) def self.overwrite_loaded_gem_version begin diff --git a/spec/bundler/commands/inject_spec.rb b/spec/bundler/commands/inject_spec.rb index 822644f39a..d091e01380 100644 --- a/spec/bundler/commands/inject_spec.rb +++ b/spec/bundler/commands/inject_spec.rb @@ -79,7 +79,7 @@ Usage: "bundle inject GEM VERSION" context "when frozen" do before do bundle "install" - if Bundler.feature_flag.bundler_2_mode? + if Bundler.feature_flag.bundler_3_mode? bundle! "config --local deployment true" else bundle! "config --local frozen true" diff --git a/spec/bundler/realworld/edgecases_spec.rb b/spec/bundler/realworld/edgecases_spec.rb index bbfd0f68fd..1db5c0f9d6 100644 --- a/spec/bundler/realworld/edgecases_spec.rb +++ b/spec/bundler/realworld/edgecases_spec.rb @@ -188,7 +188,7 @@ RSpec.describe "real world edgecases", :realworld => true, :sometimes => true do activemodel (= 4.2.7.1) activerecord (= 4.2.7.1) activesupport (= 4.2.7.1) - bundler (>= 1.3.0, < 2.0) + bundler (>= 1.3.0, < 3.0) railties (= 4.2.7.1) sprockets-rails rails-deprecated_sanitizer (1.0.3) |