aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuel Giddins <segiddins@segiddins.me>2017-01-24 15:43:16 -0600
committerSamuel Giddins <segiddins@segiddins.me>2017-01-24 15:43:16 -0600
commitc2e22795cf53040a92bef6127cc9a8a7ef07af24 (patch)
tree2563dda50545628f8c7f9e4873e388277e096b13
parent91cc62210040c4984b5d03f21943d7b60e07b28d (diff)
downloadbundler-c2e22795cf53040a92bef6127cc9a8a7ef07af24.tar.gz
Version 1.14.3 with changelog
-rw-r--r--CHANGELOG.md7
-rw-r--r--lib/bundler/version.rb2
2 files changed, 8 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a7adef9b..df566452 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## 1.14.3 (2017-01-24)
+
+Bugfixes:
+
+ - fix the resolver attemting to activate ruby-platform gems when the bundle is only for other platforms (#5349, #5356, @segiddins)
+ - avoid re-resolving a locked gemfile that uses `gemspec` and includes development dependencies (#5349, @segiddins)
+
## 1.14.2 (2017-01-22)
Bugfixes:
diff --git a/lib/bundler/version.rb b/lib/bundler/version.rb
index 4bbb17c9..bc11e8ea 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.2" unless defined?(::Bundler::VERSION)
+ VERSION = "1.14.3" unless defined?(::Bundler::VERSION)
end