diff options
| author | Samuel Giddins <segiddins@segiddins.me> | 2017-04-23 10:39:20 +0200 |
|---|---|---|
| committer | Samuel Giddins <segiddins@segiddins.me> | 2017-04-23 10:39:20 +0200 |
| commit | 7603b06bb1d36d0ffb70e88ea86febb5d49602e3 (patch) | |
| tree | d90a9b25214da309e801bd260f1949b66f42e618 | |
| parent | 334b901de575ca4b6b88e164106e2a52f4f4bff9 (diff) | |
| parent | f22a3dabfce751a0edb1089a89c853ca589b2265 (diff) | |
| download | bundler-7603b06bb1d36d0ffb70e88ea86febb5d49602e3.tar.gz | |
Merge tag 'v1.15.0.pre.2'
Version 1.15.0.pre.2
| -rw-r--r-- | CHANGELOG.md | 8 | ||||
| -rw-r--r-- | lib/bundler/version.rb | 2 | ||||
| -rw-r--r-- | task/release.rake | 3 |
3 files changed, 11 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 43e86bc4dd..d8b3c74dd4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +## 1.15.0.pre.2 (2017-04-23) + +Bugfixes: + + - ensure pre-existing fit caches are updated from remote sources (#5423, @alextaylor000) + - avoid duplicating specs in the lockfile after updating with the gem uninstalled (#5599, @segiddins) + - ensure git gems have their extensions available at runtime (#5594, @jules2689, @segiddins) + ## 1.15.0.pre.1 (2017-04-16) Features: diff --git a/lib/bundler/version.rb b/lib/bundler/version.rb index c8153cc90b..68223d9099 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.1" unless defined?(::Bundler::VERSION) + VERSION = "1.15.0.pre.2" unless defined?(::Bundler::VERSION) def self.overwrite_loaded_gem_version begin diff --git a/task/release.rake b/task/release.rake index 5653969084..e030ef8293 100644 --- a/task/release.rake +++ b/task/release.rake @@ -58,7 +58,8 @@ namespace :release do abort "#{pr["html_url"]} hasn't been closed yet!" unless pr["state"] == "closed" next unless pr["pull_request"] pr["number"].to_s - end.compact + end + prs.compact! version_file = "lib/bundler/version.rb" version_contents = File.read(version_file) |