summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Giddins <segiddins@segiddins.me>2016-09-13 18:24:27 +0200
committerSamuel Giddins <segiddins@segiddins.me>2016-09-13 18:24:27 +0200
commitee36873804e3c3bdd9d5297e762a3ac9e775cc57 (patch)
tree55428d11932e8d1980c5e615ca34973c70b90029
parentffbb417d22592fe3b0a6e5f6008fc7eee491b027 (diff)
parentfa38c7827925ec1fac4e3808b220e5d82c084884 (diff)
downloadbundler-ee36873804e3c3bdd9d5297e762a3ac9e775cc57.tar.gz
Merge tag 'v1.13.1'
Version 1.13.1
-rw-r--r--CHANGELOG.md11
-rw-r--r--lib/bundler/version.rb2
2 files changed, 12 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 244f019633..6961b52429 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,14 @@
+## 1.13.1 (2016-09-13)
+
+Bugfixes:
+
+ - ensure that `Gem::Source` is available, fixing several exceptions (#4944, @dekellum)
+ - ensure that dependency resolution works when multiple gems have the same dependency (#4961, @segiddins)
+
+## 1.13.0 (2016-09-05)
+
+This space deliberately left blank.
+
## 1.13.0.rc.2 (2016-08-21)
Features:
diff --git a/lib/bundler/version.rb b/lib/bundler/version.rb
index 8fa8d18e84..2fcacc0f33 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.13.0.rc.2" unless defined?(::Bundler::VERSION)
+ VERSION = "1.13.1" unless defined?(::Bundler::VERSION)
end