diff options
| author | Rémy Coutable <remy@rymai.me> | 2019-06-28 15:55:54 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2019-06-28 15:55:54 +0000 |
| commit | 7c38c0b4b2e43ae86ca32ea3363707e89544152f (patch) | |
| tree | 3c56ac3ef0a25368929a6d9453ff92ccc8955ddc /config | |
| parent | fd5772a8ff96e576a640edcc8dc49fd8625ab002 (diff) | |
| download | gitlab-ce-7c38c0b4b2e43ae86ca32ea3363707e89544152f.tar.gz | |
Revert "Merge branch '62722-boot-app-in-ci-and-check-memory' into 'master'"
This reverts merge request !30031
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..2811f0e6188 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' rescue LoadError # bootsnap is an optional dependency, so if we don't have it, it's fine end |