diff options
| author | Stan Hu <stanhu@gmail.com> | 2019-07-23 21:09:07 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2019-07-23 21:09:07 +0000 |
| commit | ce57b4a0cbf78035ad24c7e78ca10d95050ab97a (patch) | |
| tree | 37459e6f35986bd6367cff0d9787155b2d8fb57a | |
| parent | 5032df86ce25410928ec0aa459696a7b6f4e1b82 (diff) | |
| parent | f30b1d61d9adeaeb39febfd99ec0461b9a2251ea (diff) | |
| download | gitlab-ce-ce57b4a0cbf78035ad24c7e78ca10d95050ab97a.tar.gz | |
Merge branch 'remove-unused-begin-rescue-block' into 'master'
Speed up boot time
See merge request gitlab-org/gitlab-ce!31072
| -rw-r--r-- | config/boot.rb | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/config/boot.rb b/config/boot.rb index 2eacff868eb..da4e6b7290c 100644 --- a/config/boot.rb +++ b/config/boot.rb @@ -2,8 +2,4 @@ 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' 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 +require 'bootsnap/setup' if ENV['RAILS_ENV'] != 'production' || %w(1 yes true).include?(ENV['ENABLE_BOOTSNAP']) |