summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2017-06-22 11:54:35 -0500
committerRobert Speicher <rspeicher@gmail.com>2017-06-22 11:54:35 -0500
commit171e1bb4455c1dbb02bebf01ccae3a59a184b7ba (patch)
tree033da387cf38f0aa66447bb9a0646676dd8374cd /config
parent8fe5602c1a4c3ca1815d31e6845dd3d3c2895ec9 (diff)
downloadgitlab-ce-171e1bb4455c1dbb02bebf01ccae3a59a184b7ba.tar.gz
Revert "Merge branch 'rs-bootsnap' into 'master'"rs-revert-bootsnap
This reverts commit 95138a9c16a2d1905354d0f46381b3822b37863d, reversing changes made to 66aad16d1aaa426237e52ef19385385566f194dc.
Diffstat (limited to 'config')
-rw-r--r--config/boot.rb12
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
-)