Skip to content
This repository has been archived by the owner on Apr 14, 2021. It is now read-only.

Commit

Permalink
merge v1.16.4
Browse files Browse the repository at this point in the history
* 1-16-stable:
  Version 1.16.4 with changelog
  Auto merge of #6668 - eregon:fix-encoding-spec-from-6661, r=deivid-rodriguez
  Add encoding magic comment to gemfile spec
  Auto merge of #6662 - bundler:indirect/update-authors, r=colby-swandale
  Auto merge of #6650 - greysteil:dont-mutate-original-trees, r=segiddins
  Auto merge of #6661 - eregon:consistent-encoding-for-reading-files, r=deivid-rodriguez
  Auto merge of #6652 - bundler:seg-molinillo-0.6.6, r=segiddins
  Auto merge of #6645 - bundler:colby/require-etc, r=colby-swandale
  Auto merge of #6636 - ojab:1-16-stable, r=indirect
  Auto merge of #6624 - bundler:no-document, r=colby-swandale
  Auto merge of #6621 - ralphbolo:patch-1, r=segiddins
  Auto merge of #6613 - kemitchell:mention-show-sorts-in-doc, r=colby-swandale
  Auto merge of #6570 - akihiro17:prerelease-dependency, r=segiddins
  Auto merge of #6568 - greysteil:conservative-groups, r=segiddins
  • Loading branch information
colby-swandale committed Aug 22, 2018
2 parents 72f27b0 + a356d8c commit 0503da3
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 0 deletions.
21 changes: 21 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,24 @@
## 1.16.4 (2017-08-17)

Changes:

- Welcome new members to the Bundler core team (@indirect)
- Don't mutate original error trees when determining version_conflict_message (@greysteil)
- Update vendored Molinillo to 0.6.6 (@segiddins)

Bugfixes:

- Reword bundle update regression message to be more clear to the user when a gem's version is downgraded ([#6584](https://github.com/bundler/bundler/issues/6584), @ralphbolo)
- Respect --conservative flag when updating a dependency group ([#6560](https://github.com/bundler/bundler/issues/6560), @greysteil)
- Fix issue where a pre-release version was not being selected when it's specified in the Gemfile ([#6449](https://github.com/bundler/bundler/issues/6449), @akihiro17)
- Fix issue where `Etc` was not loaded when getting the user's home dir ([#6640](https://github.com/bundler/bundler/issues/6640), @colby-swandale)
- Use UTF-8 for reading files including Gemfile ([#6660](https://github.com/bundler/bundler/issues/6660), @eregon)
- Remove unnecessary `while` loop in path resolver helper (@ojab)

Documentation:

- Document that `bundle show [--paths]` sorts results by name (@kemitchell)

## 1.16.3 (2018-07-17)

Features:
Expand Down
1 change: 1 addition & 0 deletions spec/install/gemfile_spec.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# encoding: utf-8
# frozen_string_literal: true

RSpec.describe "bundle install" do
Expand Down

0 comments on commit 0503da3

Please sign in to comment.