Skip to content
This repository has been archived by the owner on Apr 14, 2021. It is now read-only.

Commit

Permalink
Version 1.15.0.pre.3 with changelog
Browse files Browse the repository at this point in the history
  • Loading branch information
segiddins committed May 1, 2017
1 parent c660a2d commit f395faf
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 1 deletion.
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
2 changes: 1 addition & 1 deletion lib/bundler/version.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit f395faf

Please sign in to comment.