From 5cd68a92fa0397121f25357ffae4a4bb6393ae72 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Wed, 8 Sep 2021 09:09:10 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 bin/bundle | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'bin/bundle')

diff --git a/bin/bundle b/bin/bundle
index eed4bb7738a..b70fcaf837b 100755
--- a/bin/bundle
+++ b/bin/bundle
@@ -1,8 +1,5 @@
 #!/usr/bin/env ruby
 
-require 'bundler'
-
-ENV['BUNDLE_GEMFILE'] ||=
-  Bundler.settings[:gemfile] || File.expand_path('../Gemfile', __dir__)
+require_relative '../config/bundler_setup'
 
 load Gem.bin_path('bundler', 'bundle')
-- 
cgit v1.2.3