summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.md13
-rw-r--r--lib/bundler/version.rb2
2 files changed, 14 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index df5664529d..633787a8ad 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,16 @@
+## 1.14.4 (2017-02-12)
+
+Bugfixes:
+
+ - fail gracefully when attempting to overwrite an existing directory with `bundle gem` (#5358, @nodo)
+ - fix a resolver bug that would cause bundler to report conflicts that it could resolve (#5359, #5362, @segiddins)
+ - set native extension build arguments for git gems (#5401, @segiddins)
+ - fix the suggested `bundle lock` command printed when a dependency is unused on any platform (@5t111111)
+ - ensure the version passed to `ruby` in the Gemfile is valid during Gemfile parsing (#5380, @segiddins)
+ - show `bundle inject` usage when too many arguments are passed (#5384, @Shekharrajak)
+ - stop `bundle show --outdated` from implicitly running `bundle update` (#5375, @colby-swandale)
+ - allow the temporary home directory fallback to work for multiple users (@svoop)
+
## 1.14.3 (2017-01-24)
Bugfixes:
diff --git a/lib/bundler/version.rb b/lib/bundler/version.rb
index bc11e8eaee..4ba59366d4 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.3" unless defined?(::Bundler::VERSION)
+ VERSION = "1.14.4" unless defined?(::Bundler::VERSION)
end