summaryrefslogtreecommitdiff
path: root/CHANGELOG.md
diff options
context:
space:
mode:
authorSamuel Giddins <segiddins@segiddins.me>2017-12-27 09:28:09 +0700
committerSamuel Giddins <segiddins@segiddins.me>2017-12-27 09:28:09 +0700
commit3f244c698d1db82d19e8cd660ae0c0f80960f8fe (patch)
tree858cd14e8771764875675c4548f3c42ff5c55a0d /CHANGELOG.md
parent2cc5221263cd5fe8d347a9d3de9aff9fed685742 (diff)
parent0034ef3416ca94d00839361dbeb0485b10a09c51 (diff)
downloadbundler-3f244c698d1db82d19e8cd660ae0c0f80960f8fe.tar.gz
Merge tag 'v1.16.1'
Version 1.16.1 # gpg: Signature made Fri Dec 22 01:46:37 2017 +07 # gpg: using ? key C3DA1D6CEFC720FA # gpg: Can't check signature: unknown pubkey algorithm # Conflicts: # lib/bundler/version.rb # spec/commands/exec_spec.rb # spec/realworld/double_check_spec.rb # spec/runtime/with_clean_env_spec.rb # spec/spec_helper.rb
Diffstat (limited to 'CHANGELOG.md')
-rw-r--r--CHANGELOG.md13
1 files changed, 13 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a47a411077..bbf9abe033 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,16 @@
+## 1.16.1 (2017-12-12)
+
+Bugfixes:
+
+ - avoid hanging on complex resolver errors ([#6114](https://github.com/bundler/bundler/issues/6114), @halfbyte)
+ - avoid an error when running `bundle update --group` ([#6156](https://github.com/bundler/bundler/issues/6156), @mattbrictson)
+ - ensure the resolver prefers non-pre-release gems when possible ([#6181](https://github.com/bundler/bundler/issues/6181), @greysteil)
+ - include bundler's gemspec in the built gem ([#6165](https://github.com/bundler/bundler/issues/6165), @dr-itz)
+ - ensure locally installed specs are not overriden by those in remote sources during dependency resolution ([#6072](https://github.com/bundler/bundler/issues/6072), @indirect)
+ - ensure custom gemfiles are respected in generated binstubs (@pftg)
+ - fail gracefully when loading a bundler-generated binstub when `bin/bundle` was not generated by bundler ([#6149](https://github.com/bundler/bundler/issues/6149), @hsbt)
+ - allow `bundle init` to be run even when a parent directory contains a gemfile ([#6205](https://github.com/bundler/bundler/issues/6205), @colby-swandale)
+
## 1.16.0 (2017-10-31)
Bugfixes: