diff options
author | Samuel Giddins <segiddins@segiddins.me> | 2016-05-25 14:19:57 -0500 |
---|---|---|
committer | Samuel Giddins <segiddins@segiddins.me> | 2016-05-25 14:19:57 -0500 |
commit | 7374a01a74bf7ee85619248db48504bc5ce3849e (patch) | |
tree | 7767396f9af77c8717cd775307c768cacb5a0acc | |
parent | 54f786536bc8c90a1de606fd74e39db146ce37f4 (diff) | |
parent | a65a2db118ed714586ac4c56a0584c97bf0305df (diff) | |
download | bundler-7374a01a74bf7ee85619248db48504bc5ce3849e.tar.gz |
Merge tag 'v1.12.5'
Version 1.12.5
-rw-r--r-- | CHANGELOG.md | 7 | ||||
-rw-r--r-- | lib/bundler/version.rb | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 853706f643..5c5b50c0bf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## 1.12.5 (2016-05-25) + +Bugfixes: + - only take over `--help` on `bundle exec` when the first two arguments are `exec` and `--help` (#4596, @segiddins) + - don't require `require: true` dependencies that are excluded via `env` or `install_if` (@BrianHawley) + - reduce the number of threads used simultaneously by bundler (#4367, @will-in-wi) + ## 1.12.4 (2016-05-16) Bugfixes: diff --git a/lib/bundler/version.rb b/lib/bundler/version.rb index db93547b5f..b1e8a49e25 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.4" unless defined?(::Bundler::VERSION) + VERSION = "1.12.5" unless defined?(::Bundler::VERSION) end |