1 --- passenger-release-6.0.20/src/ruby_supportlib/phusion_passenger/loader_shared_helpers.rb~ 2024-01-19 18:09:36.000000000 +0100
2 +++ passenger-release-6.0.20/src/ruby_supportlib/phusion_passenger/loader_shared_helpers.rb 2024-04-03 16:05:58.216613881 +0200
3 @@ -190,39 +190,6 @@ module PhusionPassenger
4 elsif File.exist?('config/setup_load_paths.rb')
5 require File.expand_path('config/setup_load_paths')
7 - # Older versions of Bundler use .bundle/environment.rb as the Bundler
8 - # environment lock file. This has been replaced by Gemfile.lock/gems.locked
9 - # in later versions, but we still support the older mechanism.
10 - # If the Bundler environment lock file exists then load that. If it
11 - # exists then there's a 99.9% chance that loading it is the correct
13 - elsif File.exist?('.bundle/environment.rb')
14 - running_bundler(options) do
15 - require File.expand_path('.bundle/environment')
18 - # If the legacy Bundler environment file doesn't exist then there are two
20 - # 1. Bundler is not used, in which case we don't have to do anything.
21 - # 2. Bundler *is* used, but either the user is using a newer Bundler versions,
22 - # or the gems are not locked. In either case, we're supposed to call
25 - # The existence of Gemfile/gems.rb indicates whether (2) is true:
26 - elsif File.exist?('Gemfile') || File.exist?('gems.rb')
27 - # In case of Rails 3+, config/boot.rb already calls Bundler.setup.
28 - # However older versions of Rails may not so loading boot.rb might
29 - # not be the correct thing to do. To be on the safe side we
30 - # call Bundler.setup ourselves; calling Bundler.setup twice is
31 - # harmless. If this isn't the correct thing to do after all then
32 - # there's always the load_path_setup_file option and
33 - # setup_load_paths.rb.
34 - running_bundler(options) do
35 - activate_gem 'bundler', 'bundler/setup'
41 # If the app is using Bundler then any dependencies required past this
42 # point must be specified in the Gemfile. Like ruby-debug if debugging is on...