diff options
| author | Bundlerbot <bot@bundler.io> | 2019-02-20 12:02:36 +0000 |
|---|---|---|
| committer | SHIBATA Hiroshi <hsbt@ruby-lang.org> | 2019-02-20 21:41:05 +0900 |
| commit | ef2a7f9b1b5503ce2a98a483f5da4e4f60cef490 (patch) | |
| tree | 1cb3b540dad4ccd4e9800ec0f92915d372f37f18 | |
| parent | d3cf5b4bf9d3c3d72808ca524b97937e7f626ad1 (diff) | |
| download | bundler-1-17-stable.tar.gz | |
Merge #69771-17-stable
6977: Update the location of bundler gemspec. r=deivid-rodriguez a=hsbt
### What was the end-user problem that led to this PR?
On the ruby core repository has the original patch for the test suite. The current bundler repository was inconsistency status with it.
### What was your diagnosis of the problem?
This pull-request was the missing commit of https://github.com/bundler/bundler/pull/6973
### What is your fix for the problem, implemented in this PR?
The test suite of bundler break the inconsistency gemspec location,
Co-authored-by: SHIBATA Hiroshi <hsbt@ruby-lang.org>
(cherry picked from commit 7199b124d4b6d217fc1dff2f1e93dda151ad9664)
| -rw-r--r-- | bundler.gemspec | 2 | ||||
| -rw-r--r-- | spec/support/path.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/bundler.gemspec b/bundler.gemspec index 26fc32278a..be4a9d5f15 100644 --- a/bundler.gemspec +++ b/bundler.gemspec @@ -5,7 +5,7 @@ begin require File.expand_path("../lib/bundler/version", __FILE__) rescue LoadError # for Ruby core repository - require File.expand_path("../bundler/version", __FILE__) + require File.expand_path("../version", __FILE__) end require "shellwords" diff --git a/spec/support/path.rb b/spec/support/path.rb index 76fa89d3cc..084ade46bf 100644 --- a/spec/support/path.rb +++ b/spec/support/path.rb @@ -9,7 +9,7 @@ module Spec end def gemspec - @gemspec ||= root.join(ruby_core? ? "lib/bundler.gemspec" : "bundler.gemspec") + @gemspec ||= root.join(ruby_core? ? "lib/bundler/bundler.gemspec" : "bundler.gemspec") end def bindir |