Version 1.12.5 with changelog

rubygems · May 25, 2016 · a65a2db · a65a2db
1 parent 702ae2e
commit a65a2db
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git 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
@@ -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