diff options
author | Stan Hu <stanhu@gmail.com> | 2017-06-22 20:45:40 +0000 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2017-06-22 20:45:40 +0000 |
commit | 65c2a5fe36eb47d803037a1e2b719be580635036 (patch) | |
tree | 0e54cda7f1845f623632f6d37c34b2f8b2635e86 /config | |
parent | 0c351e2142ae3be82e5d750f7e7f0bff7432ec67 (diff) | |
parent | 171e1bb4455c1dbb02bebf01ccae3a59a184b7ba (diff) | |
download | gitlab-ce-65c2a5fe36eb47d803037a1e2b719be580635036.tar.gz |
Merge branch 'rs-revert-bootsnap' into 'master'
Revert "Merge branch 'rs-bootsnap' into 'master'"
Closes #34134, #34106, and #34084
See merge request !12389
Diffstat (limited to 'config')
-rw-r--r-- | config/boot.rb | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/config/boot.rb b/config/boot.rb index 16de55d7a86..2d01092acd5 100644 --- a/config/boot.rb +++ b/config/boot.rb @@ -9,15 +9,3 @@ require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE']) if ENV['RAILS_ENV'] == 'development' || ENV['RAILS_ENV'] == 'test' ENV['prometheus_multiproc_dir'] ||= 'tmp/prometheus_multiproc_dir' end - -# Default Bootsnap configuration from https://github.com/Shopify/bootsnap#usage -require 'bootsnap' -Bootsnap.setup( - cache_dir: 'tmp/cache', - development_mode: ENV['RAILS_ENV'] == 'development', - load_path_cache: true, - autoload_paths_cache: true, - disable_trace: false, - compile_cache_iseq: true, - compile_cache_yaml: true -) |