summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Rodríguez <deivid.rodriguez@riseup.net>2019-11-18 11:56:44 +0100
committerDavid Rodríguez <deivid.rodriguez@riseup.net>2019-11-18 13:34:24 +0100
commit28cecf9c7666353cb300af2adb41f01d1d622384 (patch)
tree998b1bf96d6bcfcdc0a824b2fd331131118b2fb8
parentf6045fcf93cd3076cdd3d5e15622927c87df2db5 (diff)
downloadbundler-28cecf9c7666353cb300af2adb41f01d1d622384.tar.gz
Pick up changelog and version bump from 2-1-stable
-rw-r--r--CHANGELOG.md17
-rw-r--r--lib/bundler/version.rb2
2 files changed, 18 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index cb99ec29a9..24e2daa913 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,20 @@
+## 2.1.0.pre.3 (November 12, 2019)
+
+Features:
+
+ - Add caller information to some deprecation messages to make them easier to fix [#7361](https://github.com/bundler/bundler/pull/7361)
+ - Reconcile `bundle cache` vs `bundle package` everywhere. Now in docs, CLI help and everywhere else `bundle cache` is the preferred version and `bundle package` remains as an alias [#7389](https://github.com/bundler/bundler/pull/7389)
+ - Display some basic `bundler` documentation together with ruby's RDoc based documentation [#7394](https://github.com/bundler/bundler/pull/7394)
+
+Bugfixes:
+
+ - Fix typos deprecation message and upgrading docs [#7374](https://github.com/bundler/bundler/pull/7374)
+ - Deprecation warnings about `taint` usage on ruby 2.7 [#7385](https://github.com/bundler/bundler/pull/7385)
+ - Fix `--help` flag not correctly delegating to `man` when used with command aliases [#7388](https://github.com/bundler/bundler/pull/7388)
+ - `bundle add` should cache newly added gems if an application cache exists [#7393](https://github.com/bundler/bundler/pull/7393)
+ - Stop using an insecure folder as a "fallback home" when user home is not defined [#7416](https://github.com/bundler/bundler/pull/7416)
+ - Fix `bundler/inline` warning about `Bundler.root` redefinition [#7417](https://github.com/bundler/bundler/pull/7417)
+
## 2.1.0.pre.2 (September 15, 2019)
Bugfixes:
diff --git a/lib/bundler/version.rb b/lib/bundler/version.rb
index a2b824c471..4cf11c5fb5 100644
--- a/lib/bundler/version.rb
+++ b/lib/bundler/version.rb
@@ -1,7 +1,7 @@
# frozen_string_literal: false
module Bundler
- VERSION = "2.1.0.pre.2".freeze
+ VERSION = "2.1.0.pre.3".freeze
def self.bundler_major_version
@bundler_major_version ||= VERSION.split(".").first.to_i