diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-08 12:09:10 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-08 12:09:10 +0300 |
commit | 5cd68a92fa0397121f25357ffae4a4bb6393ae72 (patch) | |
tree | 9a3a6e7bb60419a36dd71096974a4b4177a9ed05 /bin/bundle | |
parent | 1758f49bb51884245d53fc6675f180cb522a4623 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'bin/bundle')
-rwxr-xr-x | bin/bundle | 5 |
1 files changed, 1 insertions, 4 deletions
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') |