diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-03 15:09:03 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-03 15:09:03 +0300 |
commit | 53ea1228bef63279e558b08b50144775f6f3a4c4 (patch) | |
tree | ec6534ce84a6451a67f1c34257064e1aa624b717 /bin/bundle | |
parent | 764ff99273496e7d1da0dc9cc2255445cf7dc540 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'bin/bundle')
-rwxr-xr-x | bin/bundle | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/bin/bundle b/bin/bundle index f19acf5b5cc..eed4bb7738a 100755 --- a/bin/bundle +++ b/bin/bundle @@ -1,3 +1,8 @@ #!/usr/bin/env ruby -ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) + +require 'bundler' + +ENV['BUNDLE_GEMFILE'] ||= + Bundler.settings[:gemfile] || File.expand_path('../Gemfile', __dir__) + load Gem.bin_path('bundler', 'bundle') |