diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-20 16:18:24 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-20 16:18:24 +0300 |
| commit | 0653e08efd039a5905f3fa4f6e9cef9f5d2f799c (patch) | |
| tree | 4dcc884cf6d81db44adae4aa99f8ec1233a41f55 /config/boot.rb | |
| parent | 744144d28e3e7fddc117924fef88de5d9674fe4c (diff) | |
Add latest changes from gitlab-org/gitlab@14-3-stable-eev14.3.0-rc42
Diffstat (limited to 'config/boot.rb')
| -rw-r--r-- | config/boot.rb | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/config/boot.rb b/config/boot.rb index 41bf7953737..afa3c04c3c7 100644 --- a/config/boot.rb +++ b/config/boot.rb @@ -1,7 +1,4 @@ # frozen_string_literal: true -ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) - -# Set up gems listed in the Gemfile. -require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE']) +require_relative 'bundler_setup' require 'bootsnap/setup' if ENV['RAILS_ENV'] != 'production' || %w(1 yes true).include?(ENV['ENABLE_BOOTSNAP']) |