diff options
| author | Samuel E. Giddins <segiddins@segiddins.me> | 2015-07-22 14:38:06 -0700 |
|---|---|---|
| committer | Samuel E. Giddins <segiddins@segiddins.me> | 2015-07-22 14:38:06 -0700 |
| commit | c784ea3ade399fd487184493f7e8c0e340e7d6d7 (patch) | |
| tree | af0c0d52d663b81c110929a96fd22faf1b2897e3 /CHANGELOG.md | |
| parent | 8d25615ab4c3b72d8d1154d32d5b65e268f16226 (diff) | |
| parent | a85578ca41922c74f3789c755ee5105014cd9d7c (diff) | |
| download | bundler-c784ea3ade399fd487184493f7e8c0e340e7d6d7.tar.gz | |
Merge tag 'v1.10.6'
Version 1.10.6
# Conflicts:
# lib/bundler/cli.rb
# lib/bundler/source/git/git_proxy.rb
# spec/install/parallel/spec_installation_spec.rb
Diffstat (limited to 'CHANGELOG.md')
| -rw-r--r-- | CHANGELOG.md | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 1bad906041..1765cc0372 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,15 @@ +## 1.10.6 (2015-07-22) + +Workarounds: + + - only warn on invalid gemspecs (@indirect) + +Bugfixes: + + - fix installing dependencies in the correct order (#3799, @pducks32) + - fix sorting of mixed DependencyLists (#3762, @tony-spataro-rs) + - fix `install_if` conditionals when using the block form (@danieltdt) + ## 1.10.5 (2015-06-24) Workarounds: |