diff options
| author | Bundlerbot <bot@bundler.io> | 2019-12-18 08:57:00 +0000 |
|---|---|---|
| committer | Bundlerbot <bot@bundler.io> | 2019-12-18 08:57:00 +0000 |
| commit | e92ab5e72445d3f4048fa610db73b239c7a1ec5e (patch) | |
| tree | cbbd473d052b44eb7d605c4e6fad3f22570f589b | |
| parent | f3f34bc5e62c513190f7608edab5818414ee9669 (diff) | |
| parent | 26c41ce1bac3a88a6c8a46cb52d8cd613f77f7cb (diff) | |
| download | bundler-e92ab5e72445d3f4048fa610db73b239c7a1ec5e.tar.gz | |
Merge #7503
7503: Bump version and changelog after release r=deivid-rodriguez a=deivid-rodriguez
### What was the end-user problem that led to this PR?
The problem was changelog and version bump not yet in master.
### What is your fix for the problem, implemented in this PR?
My fix is to merge back changelog and version bump after the release from the stable branch.
Co-authored-by: David RodrÃguez <deivid.rodriguez@riseup.net>
| -rw-r--r-- | CHANGELOG.md | 7 | ||||
| -rw-r--r-- | lib/bundler/version.rb | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 1393d19942..ec13c08754 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## 2.1.1 (December 17, 2019) + +Bugfixes: + + - Fix some cases of shelling out to `rubygems` still being silent [#7493](https://github.com/bundler/bundler/pull/7493) + - Restore compatibility with `rubygems-bundler` so that binstubs work under `RVM` [#7498](https://github.com/bundler/bundler/pull/7498) + ## 2.1.0 (December 15, 2019) Features: diff --git a/lib/bundler/version.rb b/lib/bundler/version.rb index 417b21f18a..06d6a0f255 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".freeze + VERSION = "2.1.1".freeze def self.bundler_major_version @bundler_major_version ||= VERSION.split(".").first.to_i |