diff options
author | Samuel Giddins <segiddins@segiddins.me> | 2017-03-03 17:45:17 -0600 |
---|---|---|
committer | Samuel Giddins <segiddins@segiddins.me> | 2017-03-03 17:45:17 -0600 |
commit | c0fb52f440f45e0c5cd5d18234118e7dcfe1ab41 (patch) | |
tree | 039eaf99fa09a9673a144e93cc99d40070cd5614 | |
parent | c020f1039405f9701444bad37f66907e80c756b4 (diff) | |
parent | 0c38a39ecf5e8c677ec26d21ca82f115f90c6c7e (diff) | |
download | bundler-c0fb52f440f45e0c5cd5d18234118e7dcfe1ab41.tar.gz |
Merge tag 'v1.14.6'
Version 1.14.6
-rw-r--r-- | CHANGELOG.md | 10 | ||||
-rw-r--r-- | lib/bundler/version.rb | 2 |
2 files changed, 11 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 6cf533d16c..55d9ea5ab3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,13 @@ +## 1.14.6 (2017-03-03) + +Bugfixes: + + - avoid undefined constant `Bundler::Plugin::API::Source` exception (#5409, @segiddins) + - avoid incorrect warnings about needing to enable `specific_platform` (@segiddins) + - fail gracefully when the compact index does not send an ETag (#5463, @olleolleolle) + - ensure `bundle outdated --local` shows all outdated gems (#5430, @denniss) + - fix a case where ruby version requirements could lead to incorrect resolver conflicts (#5425, @segiddins) + ## 1.14.5 (2017-02-22) Bugfixes: diff --git a/lib/bundler/version.rb b/lib/bundler/version.rb index 36cc05cb39..9309eb39e3 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.14.5" unless defined?(::Bundler::VERSION) + VERSION = "1.14.6" unless defined?(::Bundler::VERSION) end |