diff options
| author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2019-07-23 16:35:41 +0300 |
|---|---|---|
| committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2019-07-23 16:35:41 +0300 |
| commit | 76d3b35cb6082d44188cb1c61d1bff0335e6646d (patch) | |
| tree | 5413ab5fa054c3f06e3c7eecc47d29deab7df9cd /config | |
| parent | fcb09f0f4a3cf7cceec48dbae1e8f4bec04b9469 (diff) | |
| parent | 6c97f9f5ec1f8c59ebcaf6bf8a71432e89a1d993 (diff) | |
Merge branch 'sh-enable-bootsnap' into 'master'
Make Bootsnap available via ENABLE_BOOTSNAP=1
Closes #45230
See merge request gitlab-org/gitlab-ce!30963
Diffstat (limited to 'config')
| -rw-r--r-- | config/boot.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/boot.rb b/config/boot.rb index b76b26a5e75..2eacff868eb 100644 --- a/config/boot.rb +++ b/config/boot.rb @@ -3,7 +3,7 @@ ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) # Set up gems listed in the Gemfile. require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE']) begin - require 'bootsnap/setup' unless ENV['DISABLE_BOOTSNAP'] + require 'bootsnap/setup' if ENV['RAILS_ENV'] != 'production' || %w(1 yes true).include?(ENV['ENABLE_BOOTSNAP']) rescue LoadError # bootsnap is an optional dependency, so if we don't have it, it's fine end |