aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuel Giddins <segiddins@segiddins.me>2017-01-24 15:44:17 -0600
committerSamuel Giddins <segiddins@segiddins.me>2017-01-24 15:44:17 -0600
commit8c0cbf3c03a56b8cdfeaba2558c35f461608b287 (patch)
treeb450f07e9a156a53ba4c974cd5ef566d1afbd856
parentd3c50f80d34d1ee7fa84d3d8a6a930c55186fbab (diff)
parentc2e22795cf53040a92bef6127cc9a8a7ef07af24 (diff)
downloadbundler-8c0cbf3c03a56b8cdfeaba2558c35f461608b287.tar.gz
Merge tag 'v1.14.3'HEADmaster
Version 1.14.3
-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