From a65a2db118ed714586ac4c56a0584c97bf0305df Mon Sep 17 00:00:00 2001 From: Samuel Giddins Date: Wed, 25 May 2016 14:19:18 -0500 Subject: [PATCH] Version 1.12.5 with changelog --- CHANGELOG.md | 7 +++++++ lib/bundler/version.rb | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 853706f643c..5c5b50c0bfd 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 db93547b5f7..b1e8a49e25b 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