summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Giddins <segiddins@segiddins.me>2017-01-11 17:12:44 -0600
committerSamuel Giddins <segiddins@segiddins.me>2017-01-11 17:12:44 -0600
commit5bd4e729ee801298e914702cd5038c3afb046e9e (patch)
tree5118503260ed1bb5016f81a6c919b5c1a819bb48
parentdb84c3f8f5ed6c151690e29b3b155fc045e068d5 (diff)
parent226dd03445301c778b8b49932f2c691b83413340 (diff)
downloadbundler-5bd4e729ee801298e914702cd5038c3afb046e9e.tar.gz
Merge tag 'v1.14.0.pre.2'
Version 1.14.0.pre.2
-rw-r--r--CHANGELOG.md11
-rw-r--r--lib/bundler/version.rb2
2 files changed, 11 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f669618faa..5a82241c9c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,13 @@
-## 1.14.0.pre.1
+## 1.14.0.pre.2 (2016-01-11)
+
+Bugfixes:
+
+ - allow not selecting a gem when running `bundle open` (#5301, @segiddins)
+ - support installing gems from git branches that contain shell metacharacters (#5295, @segiddins)
+ - 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)
Features:
diff --git a/lib/bundler/version.rb b/lib/bundler/version.rb
index 789e198309..a514b75cce 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.1" unless defined?(::Bundler::VERSION)
+ VERSION = "1.14.0.pre.2" unless defined?(::Bundler::VERSION)
end