summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColby Swandale <me@colby.fyi>2018-10-07 16:54:51 +1100
committerColby Swandale <me@colby.fyi>2018-10-07 16:54:51 +1100
commit477115c0699c89a940171c4911dbc2b060054f84 (patch)
tree9951aa82b5f8b8eb2bba0bc8e9c57e62eaa0cb62
parent703b663a862aeada82169ecf183751616d61a268 (diff)
parentf66c3346733afeeff3ac4b09f522fe40bc8dbb44 (diff)
downloadbundler-477115c0699c89a940171c4911dbc2b060054f84.tar.gz
Merge branch '1-16-stable'
* 1-16-stable: Version 1.16.6 with changelog fix uninitialized @use_gvp instance var warning no longer test Ruby 1.9.3 against rubygems master Merge #6708 Auto merge of #6697 - walf443:added_changelog_section, r=hsbt Merge #6687 Merge #6686 Auto merge of #6670 - bundler:colby/invite-stephanie-morillo, r=segiddins Auto merge of #6627 - agrim123:agr-fix-add-groups, r=deivid-rodriguez Auto merge of #6612 - hdf1986:readme-bundle-add, r=segiddins Auto merge of #6495 - bundler:segiddins/6491-extra-gem-platform-in-lockfile, r=segiddins Auto merge of #6493 - agrim123:agr-update-bundle-update-docs, r=colby-swandale Auto merge of #6310 - utilum:rescue_unspecified_exception, r=segiddins Auto merge of #6184 - arbonap:pa-check-in-gemfile-docs, r=indirect fix typo
-rw-r--r--CHANGELOG.md22
1 files changed, 22 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index fe051607ad..23c462e7af 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,25 @@
+## 1.16.6 (2018-10-05)
+
+Changes:
+
+ - Add an error message when adding a gem with `bundle add` that's already in the bundle ([#6341](https://github.com/bundler/bundler/issues/6341), @agrim123)
+ - Add Homepage, Source Code and Chanagelog URI metadata fields to the `bundle gem` gemspec template (@walf443)
+
+Bugfixes:
+
+ - Fix issue where updating a gem resulted in the gem's version being downgraded when `BUNDLE_ONLY_UPDATE_TO_NEWER_VERSIONS` was set ([#6529](https://github.com/bundler/bundler/issues/6529), @theflow)
+ - Fix some rescue calls that don't specifiy error type (@utilum)
+ - Fix an issue when the Lockfile would contain platform-specific gems that it didn't need ([#6491](https://github.com/bundler/bundler/issues/6491), @segiddins)
+ - Improve handlding of adding new gems with only a single group to the Gemfile in `bundle add` (@agrim123)
+ - Refactor check for OpenSSL in `bundle env` (@voxik)
+ - Remove an unnecessary assignment in Metadata (@voxik)
+
+Documentation:
+
+ - Update docs to reflect revised guidance to check in Gemfile.lock into version control for gems ([#5879](https://github.com/bundler/bundler/issues/5879), @arbonap)
+ - Add documentation for the `--all` flag in `bundle update` (@agrim123)
+ - Update README to use `bundle add` in usage examples (@hdf1986)
+
## 1.16.5 (2018-09-18)
Changes: