diff options
| -rw-r--r-- | CHANGELOG.md | 9 | ||||
| -rw-r--r-- | lib/bundler/version.rb | 2 |
2 files changed, 8 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index e1693e959f..5460aa15d5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,10 +1,15 @@ ## 1.6.0 +Bugfixes: + + - many Gemfiles that had incorrect errors now resolve correctly (@Who828) + Features: + - resolver rewritten to avoid recursion (@Who828) + - some complex Gemfiles are resolved up to 10x faster (@Who828) - add support for IRB alternatives such as Pry and Ripl (@joallard, @postmodern) - - highlight installing logs (#2722, @yaotti) - - highlight updating logs (#2741, @simi) + - highlight installed or updated gems (#2722, #2741, @yaotti, @simi) - display post_install_message's for gems installed via :git (@phallstrom) ## 1.5.2 (2014-01-10) diff --git a/lib/bundler/version.rb b/lib/bundler/version.rb index 8db1d63b32..05eb3ba2ff 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.5.2" unless defined?(::Bundler::VERSION) + VERSION = "1.6.0.pre.1" unless defined?(::Bundler::VERSION) end |