summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBundlerbot <bot@bundler.io>2019-11-06 12:51:35 +0000
committerDavid Rodríguez <deivid.rodriguez@riseup.net>2019-11-07 16:41:44 +0100
commiteaf05e5b21a6fe09a123aaaf868f251c66e1a05f (patch)
tree8044ca35b6dae6efbbbd6eb5e3b06348f3debe72
parent184569535cb6ddc46558861e29050225d281c9a1 (diff)
downloadbundler-eaf05e5b21a6fe09a123aaaf868f251c66e1a05f.tar.gz
Merge #7424
7424: Drop unnecessary `tempfile` require r=deivid-rodriguez a=deivid-rodriguez ### What was the end-user problem that led to this PR? The `tempfile` dependency was dropped in [1], but the require was left in there. This could cause gem conflicts because `tempfile` requires `tmpdir` which requires `fileutils`, which loads the default gem instead of our namespaced version, and that could cause fileutils version mismatches and code overriding warnings. [1]: https://github.com/bundler/bundler/commit/4a37d66f3f222739178d798b30fb135f2429fe45 ### What is your fix for the problem, implemented in this PR? My fix is to drop the unnecessary require. Co-authored-by: David Rodríguez <deivid.rodriguez@riseup.net> (cherry picked from commit 0070d9fdddc027c0ee17662a1617e05b17331171)
-rw-r--r--lib/bundler/source/git/git_proxy.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/bundler/source/git/git_proxy.rb b/lib/bundler/source/git/git_proxy.rb
index 1f6dc5d8f9..2a4d7138a4 100644
--- a/lib/bundler/source/git/git_proxy.rb
+++ b/lib/bundler/source/git/git_proxy.rb
@@ -2,7 +2,7 @@
require "open3"
require "shellwords"
-require "tempfile"
+
module Bundler
class Source
class Git