summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.md12
-rw-r--r--lib/bundler/version.rb2
2 files changed, 13 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index aa83fcc6d9..cc8ed1bd48 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,15 @@
+## 1.10.6 (2015-07-22)
+
+Workarounds:
+
+ - only warn on invalid gemspecs (@indirect)
+
+Bugfixes:
+
+ - fix installing dependencies in the correct order (#3799, @pducks32)
+ - fix sorting of mixed DependencyLists (#3762, @tony-spataro-rs)
+ - fix `install_if` conditionals when using the block form (@danieltdt)
+
## 1.10.5 (2015-06-24)
Workarounds:
diff --git a/lib/bundler/version.rb b/lib/bundler/version.rb
index 9873d538f3..984293e95e 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.5" unless defined?(::Bundler::VERSION)
+ VERSION = "1.10.6" unless defined?(::Bundler::VERSION)
end