diff options
author | Samuel Giddins <segiddins@segiddins.me> | 2017-07-21 14:49:29 -0500 |
---|---|---|
committer | Samuel Giddins <segiddins@segiddins.me> | 2017-07-21 14:49:29 -0500 |
commit | ad66f5ebceecd11a6e7386e079138755f00d9781 (patch) | |
tree | 5aa81c4d69acf05aadd37ae0adfa9430141bfed7 | |
parent | 50ba97d8e31f5a543195b303d4bea20d02ecc0df (diff) | |
parent | 70be39c679e4218e3e0c94fa2f5c785ef5575832 (diff) | |
download | bundler-ad66f5ebceecd11a6e7386e079138755f00d9781.tar.gz |
Merge tag 'v1.15.3'
Version 1.15.3
# Conflicts:
# lib/bundler/cli.rb
# spec/bundler/cli_spec.rb
-rw-r--r-- | CHANGELOG.md | 7 | ||||
-rw-r--r-- | lib/bundler/version.rb | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index c01414e9a3..4b21ff4b25 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## 1.15.3 (2017-07-21) + +Bugfixes: + + - ensure that empty strings passed to `bundle config` are serialized & parsed properly (#5881, @segiddins) + - avoid printing an outdated version warning when running a parseable command (@segiddins) + ## 1.15.2 (2017-07-17) Features: diff --git a/lib/bundler/version.rb b/lib/bundler/version.rb index a906b127d4..a8230eceae 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.2" unless defined?(::Bundler::VERSION) + VERSION = "1.15.3" unless defined?(::Bundler::VERSION) def self.overwrite_loaded_gem_version begin |