diff options
| author | Samuel Giddins <segiddins@segiddins.me> | 2017-01-20 17:42:03 -0600 |
|---|---|---|
| committer | Samuel Giddins <segiddins@segiddins.me> | 2017-01-20 17:42:03 -0600 |
| commit | b70adf296ad8da8f2943a93aa94f22b75b9cba52 (patch) | |
| tree | 014453c8bb8f2b85846b2bbadfcf2abc949f272b | |
| parent | 1f9a875727fea63a1f839a6e980edad90762a3f7 (diff) | |
| parent | 5fb2d6f6e5b8af211225d37f19dbbd36b3559689 (diff) | |
| download | bundler-b70adf296ad8da8f2943a93aa94f22b75b9cba52.tar.gz | |
Merge tag 'v1.14.0'
Version 1.14.0
| -rw-r--r-- | CHANGELOG.md | 12 | ||||
| -rw-r--r-- | lib/bundler/version.rb | 2 |
2 files changed, 11 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 5a82241c9c..091979f5e2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,12 @@ -## 1.14.0.pre.2 (2016-01-11) +## 1.14.0 (2017-01-20) + +Bugfixes: + + - ensure `Settings::Mirror` is autoloaded under the `Settings` namespace + (#5238, @segiddins) + - fix `bundler/inline` when `BUNDLE_GEMFILE=""` (#5079, @segiddins) + +## 1.14.0.pre.2 (2017-01-11) Bugfixes: @@ -7,7 +15,7 @@ Bugfixes: - fix a resolver error that could leave dependencies unresolved (#5294, @segiddins) - fix a stack overflow error when invoking commands (#5296, @segiddins) -## 1.14.0.pre.1 (2016-12-xx) +## 1.14.0.pre.1 (2016-12-29) Features: diff --git a/lib/bundler/version.rb b/lib/bundler/version.rb index a514b75cce..a55df76934 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.0.pre.2" unless defined?(::Bundler::VERSION) + VERSION = "1.14.0" unless defined?(::Bundler::VERSION) end |