diff --git a/CHANGELOG.md b/CHANGELOG.md index d8b3c74dd46..55a3b8a932a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,13 @@ +## 1.15.0.pre.3 (2017-04-30) + +Bugfixes: + + - avoid redundant blank lines in the readme generated by `bundle gem` (@koic) + - ensure that `open-uri` is not loaded after `bundle exec` (@segiddins) + - print a helpful error message when an activated default gem conflicts with + a gem in the gemfile (@segiddins) + - only shorten `ref` option for git gems when it is a SHA (#5620, @segiddins) + ## 1.15.0.pre.2 (2017-04-23) Bugfixes: diff --git a/lib/bundler/version.rb b/lib/bundler/version.rb index 68223d9099e..e8a024975d8 100644 --- a/lib/bundler/version.rb +++ b/lib/bundler/version.rb @@ -7,7 +7,7 @@ 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.15.0.pre.2" unless defined?(::Bundler::VERSION) + VERSION = "1.15.0.pre.3" unless defined?(::Bundler::VERSION) def self.overwrite_loaded_gem_version begin