diff options
| author | Bundlerbot <bot@bundler.io> | 2019-12-22 15:21:19 +0000 |
|---|---|---|
| committer | Bundlerbot <bot@bundler.io> | 2019-12-22 15:21:19 +0000 |
| commit | 3df56d9a374b7239d196e02adffa6bcb734af49d (patch) | |
| tree | 47ff8aa82d1f89b39211ff4d4e9f9adbcfaf3dea | |
| parent | 833faa964d3fed873742c03d1584b9d5a8172bee (diff) | |
| parent | d671c0e2c7691656c956782af158aaa1b3da5bfc (diff) | |
| download | bundler-3df56d9a374b7239d196e02adffa6bcb734af49d.tar.gz | |
Merge #7516
7516: Bump version and changelog r=deivid-rodriguez a=deivid-rodriguez
### What was the end-user problem that led to this PR?
The problem was master branch doesn't yet include the version bump and changelog from 2.1.2.
### What is your fix for the problem, implemented in this PR?
My fix is to include those.
Co-authored-by: David RodrÃguez <deivid.rodriguez@riseup.net>
| -rw-r--r-- | CHANGELOG.md | 6 | ||||
| -rw-r--r-- | lib/bundler/version.rb | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index ec13c08754..612b0e36bb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## 2.1.2 (December 20, 2019) + +Bugfixes: + + - Restore an explicit `require "rubygems"` on top `rubygems_integration.rb` to avoid some missing constant errors under some convoluted setups [#7505](https://github.com/bundler/bundler/pull/7505) + ## 2.1.1 (December 17, 2019) Bugfixes: diff --git a/lib/bundler/version.rb b/lib/bundler/version.rb index 06d6a0f255..b63e39b8d2 100644 --- a/lib/bundler/version.rb +++ b/lib/bundler/version.rb @@ -1,7 +1,7 @@ # frozen_string_literal: false module Bundler - VERSION = "2.1.1".freeze + VERSION = "2.1.2".freeze def self.bundler_major_version @bundler_major_version ||= VERSION.split(".").first.to_i |