summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Rodríguez <deivid.rodriguez@riseup.net>2019-12-17 12:00:59 +0100
committerDavid Rodríguez <deivid.rodriguez@riseup.net>2019-12-17 12:02:23 +0100
commit1df1b577f1d5fc9b15b106d80580e86016009c88 (patch)
tree4a4ac6235bedcf4475ba90fe07e2f2efaba56e72
parentf54ae4f4b2e287792f53410dec42e6b26b3dfcaa (diff)
downloadbundler-1df1b577f1d5fc9b15b106d80580e86016009c88.tar.gz
Merge changelog and version bump back to master
-rw-r--r--CHANGELOG.md24
-rw-r--r--lib/bundler/version.rb2
2 files changed, 25 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 24e2daa913..1393d19942 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,27 @@
+## 2.1.0 (December 15, 2019)
+
+Features:
+
+ - Add support for new default gems. In particular,
+
+ * `open3` [#7455](https://github.com/bundler/bundler/pull/7455)
+ * `cgi`: [#7456](https://github.com/bundler/bundler/pull/7456)
+ * `uri` [#7460](https://github.com/bundler/bundler/pull/7460)
+
+ plus other PRs removing or lazily loading usages of these gems from other places to not interfere with user's choice, such as [#7471](https://github.com/bundler/bundler/pull/7471) or [#7473](https://github.com/bundler/bundler/pull/7473)
+
+Bugfixes:
+
+ - Fix `bundle exec rake install` failing [#7474](https://github.com/bundler/bundler/pull/7474)
+ - Fix `bundle exec`'ing to rubygems being silent [#7442](https://github.com/bundler/bundler/pull/7442)
+ - Restore previous `BUNDLE_GEMFILE` in `bundler/inline` [#7418](https://github.com/bundler/bundler/pull/7418)
+ - Fix error when using `gem` DSL's `:glob` option for selecting gemspecs from a specific source [#7419](https://github.com/bundler/bundler/pull/7419)
+
+Changes:
+
+ - `bundle config` no longer warns when using "old interface" (might be deprecated again in the future) [#7475](https://github.com/bundler/bundler/pull/7475)
+ - `bundle update` no longer warns when used without arguments (might be deprecated again in the future) [#7475](https://github.com/bundler/bundler/pull/7475)
+
## 2.1.0.pre.3 (November 12, 2019)
Features:
diff --git a/lib/bundler/version.rb b/lib/bundler/version.rb
index 4cf11c5fb5..417b21f18a 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.3".freeze
+ VERSION = "2.1.0".freeze
def self.bundler_major_version
@bundler_major_version ||= VERSION.split(".").first.to_i