summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Giddins <segiddins@segiddins.me>2016-04-15 15:52:55 -0500
committerSamuel Giddins <segiddins@segiddins.me>2016-04-15 15:52:55 -0500
commitf401c17292c67b94b0f15a8c40af528fbb243f37 (patch)
tree201207736d2cf094220a013b53371f7c3ee53ffb
parente70a96518c5bb50fe931e0ee9bde9aa2c6851ce8 (diff)
parent009ac70f7499bf5df535220344348c8f4ac35163 (diff)
downloadbundler-f401c17292c67b94b0f15a8c40af528fbb243f37.tar.gz
Merge tag 'v1.12.0.rc.2'
Version 1.12.0.rc.2 # Conflicts: # .travis.yml # Rakefile # lib/bundler/runtime.rb # spec/commands/package_spec.rb
-rw-r--r--CHANGELOG.md24
-rw-r--r--lib/bundler/version.rb2
2 files changed, 25 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 466e423815..8f2cf07716 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,27 @@
+## 1.12.0.rc.2 (2016-04-15)
+
+Features:
+
+ - `bundle outdated` handles all combinations of `--major`, `--minor`, and `--patch` (#4396, @RochesterinNYC)
+
+Bugfixes:
+
+ - prevent endless recursive copy for `bundle package --all` (#4392, @RochesterinNYC)
+ - allow executables that are `load`ed to exit non-0 via an `at_exit` hook when invoked by `bundle exec` (@segiddins)
+ - nested invocations of `bundle exec` properly preserve the `$PATH` and `$GEM_PATH` environment variables (@segiddins)
+
+## 1.12.0.rc (2016-03-13)
+
+Performance:
+
+ - Download gem metadata from globally distributed CDN endpoints (#4358, @segiddins)
+
+Bugfixes:
+
+ - handle Ruby pre-releases built from source (#4324, @RochesterinNYC)
+ - support binstubs from RubyGems 2.6 (#4341, @segiddins)
+ - handle quotes present in in PATH (#4326, @segiddins)
+
## 1.12.0.pre.2 (2016-02-26)
Performance:
diff --git a/lib/bundler/version.rb b/lib/bundler/version.rb
index 1aa11d0dc2..8a8241874a 100644
--- a/lib/bundler/version.rb
+++ b/lib/bundler/version.rb
@@ -7,5 +7,5 @@ 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 = "1.12.0.pre.2" unless defined?(::Bundler::VERSION)
+ VERSION = "1.12.0.rc.2" unless defined?(::Bundler::VERSION)
end