summaryrefslogtreecommitdiff
path: root/lib/bundler
diff options
context:
space:
mode:
authorDavid Rodríguez <deivid.rodriguez@riseup.net>2019-08-16 17:45:00 +0200
committerHiroshi SHIBATA <hsbt@ruby-lang.org>2019-08-18 13:45:45 +0900
commit683f9e1dbf42aa4b326b244f1d4dbbbdcb9e8ceb (patch)
treec16edebadd360e0a1d8610f1cd57a3e5b42032ae /lib/bundler
parent4756c5f7e79642484d01a7dbca17357eb8b08ef1 (diff)
[bundler/bundler] No need to activate the `fileutils` default gem
The version we're vendoring actually relaxed this restriction back to 2.3.0+, so we can always use the vendored version. https://github.com/bundler/bundler/commit/d366cbfe5d
Diffstat (limited to 'lib/bundler')
-rw-r--r--lib/bundler/vendored_fileutils.rb7
1 files changed, 1 insertions, 6 deletions
diff --git a/lib/bundler/vendored_fileutils.rb b/lib/bundler/vendored_fileutils.rb
index 4b71759224..1be1138ce2 100644
--- a/lib/bundler/vendored_fileutils.rb
+++ b/lib/bundler/vendored_fileutils.rb
@@ -1,9 +1,4 @@
# frozen_string_literal: true
module Bundler; end
-if RUBY_VERSION >= "2.4"
- require_relative "vendor/fileutils/lib/fileutils"
-else
- # the version we vendor is 2.4+
- require "fileutils"
-end
+require_relative "vendor/fileutils/lib/fileutils"