summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Rodríguez <deivid.rodriguez@riseup.net>2020-01-05 15:39:13 +0100
committerDavid Rodríguez <deivid.rodriguez@riseup.net>2020-01-27 18:54:40 +0100
commit48af0df189008df778591962bad28c2e6e0cae65 (patch)
treec25cda3e3cf0513831e0ea3d87d93efb1914bf12
parentde6a4867f7be52da75bef6cdf804e1ccb2f12213 (diff)
downloadbundler-48af0df189008df778591962bad28c2e6e0cae65.tar.gz
Changelog for 2.1.4merge_2_1_4_changelog
-rw-r--r--CHANGELOG.md7
1 files changed, 7 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2fb3a0bf39..1cfa974545 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## 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: