summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndre Arko <andre@arko.net>2015-06-23 22:57:19 -0700
committerAndre Arko <andre@arko.net>2015-06-23 22:57:19 -0700
commite6b23f85d76f2eaa048fb83f65a8836765b731db (patch)
tree357fac2cb7fb3084a860d80259e12cd9b477a961
parent901a6baecf8b86d1575d4a326d1b69327be0dc6d (diff)
downloadbundler-e6b23f85d76f2eaa048fb83f65a8836765b731db.tar.gz
Version 1.10.5 with changelog
-rw-r--r--CHANGELOG.md6
-rw-r--r--lib/bundler/version.rb2
2 files changed, 5 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4a0424f13a..cf740d1f48 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,10 @@
-## 1.10.5 (Unreleased)
+## 1.10.5 (2015-06-24)
Bugfixes:
- - fix sorting of mixed DependencyLists with RubyGems >= 2.23 (@tony-spataro-rs)
+ - fix sorting of mixed DependencyLists with RubyGems >= 2.23 (#3762, @tony-spataro-rs)
+ - speed up resolver for path and git gems (@segiddins)
+ - fix `install --force` to not reinstall Bundler (#3743, @karlo57)
## 1.10.4 (2015-06-16)
diff --git a/lib/bundler/version.rb b/lib/bundler/version.rb
index e4646d5b79..9873d538f3 100644
--- a/lib/bundler/version.rb
+++ b/lib/bundler/version.rb
@@ -2,5 +2,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.10.4" unless defined?(::Bundler::VERSION)
+ VERSION = "1.10.5" unless defined?(::Bundler::VERSION)
end