diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2019-07-01 15:29:49 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2019-07-01 15:29:49 +0000 |
| commit | 59963779362b00723d79ae6190689ad0fccf729e (patch) | |
| tree | ae6bc14e665dd0932285492f52ceb25011a77f2d /config | |
| parent | 77212dd5eccc0ef154c088f9bafb4bede4acc86f (diff) | |
| parent | f44719f39cb9ee88c63759caa582d484cd6d4e9a (diff) | |
| download | gitlab-ce-59963779362b00723d79ae6190689ad0fccf729e.tar.gz | |
Merge branch '62722-boot-app-in-ci-and-check-memory-ce' into 'master'
Get memory data after booting app in production
Closes #62722
See merge request gitlab-org/gitlab-ce!30185
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 2811f0e6188..b76b26a5e75 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' + require 'bootsnap/setup' unless ENV['DISABLE_BOOTSNAP'] rescue LoadError # bootsnap is an optional dependency, so if we don't have it, it's fine end |