Merge #7608

7608: Merge 2.1.4 changelog r=deivid-rodriguez a=deivid-rodriguez

<!--
Thanks so much for the contribution!

If you're updating documentation, make sure you run `bin/rake man:build` and
squash the result into your changes, so that all documentation formats are
updated.

To make reviewing this PR a bit easier, please fill out answers to the following questions.
-->

### What was the end-user or developer problem that led to this PR?

The problem is that the changelog is up to date on 2-1-stable, but not in master.

### What is your fix for the problem, implemented in this PR?

My fix is to bring it up to date.

Closes #7607.

Co-authored-by: David Rodríguez <deivid.rodriguez@riseup.net>

1 files changed, 16 insertions, 0 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9bf8e81a7f..1cfa974545 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,19 @@
+## 2.1.4 (January 5, 2020)
+
+Bugfixes:
+
+  - Fix `net-http-pipeline` no longer being allowed in Gemfiles if already installed in the system due to our vendored version of `net-http-persistent` optionally requiring it [#7529](https://github.com/bundler/bundler/pull/7529)
+  - Fix inline gems no longer being requirable if no Gemfile is present in the directory hierarchy [#7537](https://github.com/bundler/bundler/pull/7537)
+
+## 2.1.3 (January 2, 2020)
+
+Bugfixes:
+
+  - Fix `rake build` when path has spaces on it [#7514](https://github.com/bundler/bundler/pull/7514)
+  - Fix `rake release` git push tasks when the running shell has `git` as an alias of another command (like `hub`) [#7510](https://github.com/bundler/bundler/pull/7510)
+  - Fix some circular require warnings [#7520](https://github.com/bundler/bundler/pull/7520)
+  - Fix `bundle config set deployment true` recommended alternative to `bundle config --deployment` to behave in the same way as the `--deployment` flag [#7519](https://github.com/bundler/bundler/pull/7519)
+
 ## 2.1.2 (December 20, 2019)
 
 Bugfixes: