diff options
| author | Bundlerbot <bot@bundler.io> | 2019-08-16 00:03:01 +0000 |
|---|---|---|
| committer | Bundlerbot <bot@bundler.io> | 2019-08-16 00:03:01 +0000 |
| commit | 982e415d6b7c02c413dab39df31f27088e969435 (patch) | |
| tree | 98432320dbaf199d96aee0bcb1047424226cb6a4 /lib | |
| parent | 91f91a1ada123cb2da02307b2107aa5119a557f4 (diff) | |
| parent | 925617744622b123b6b55b2c9d750ab061097219 (diff) | |
| download | bundler-982e415d6b7c02c413dab39df31f27088e969435.tar.gz | |
Merge #7301
7301: Track changes from ruby core master r=hsbt a=hsbt
### What was the end-user problem that led to this PR?
I'm going to merge https://github.com/bundler/bundler/pull/7274. But the ruby-core source has some of the changes for bundler source.
### What was your diagnosis of the problem?
### What is your fix for the problem, implemented in this PR?
ruby core team fixed them:
* Removed circular require warning at `shared_helper.rb`
* Support test at GitHub Actions, It helps that bundler will migrate Actions from Azure Pipelines too.
* Fixed broken examples at ruby core repository
### Why did you choose this fix out of the possible options?
Co-authored-by: ohbarye <over.rye@gmail.com>
Co-authored-by: Hiroshi SHIBATA <hsbt@ruby-lang.org>
Co-authored-by: Yusuke Endoh <mame@ruby-lang.org>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/bundler/shared_helpers.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/bundler/shared_helpers.rb b/lib/bundler/shared_helpers.rb index 62a292fcee..af1836009f 100644 --- a/lib/bundler/shared_helpers.rb +++ b/lib/bundler/shared_helpers.rb @@ -2,7 +2,6 @@ require "pathname" require "rbconfig" -require "rubygems" require_relative "version" require_relative "constants" |