Merge branch 'rs-revert-bootsnap' into 'master'

Revert "Merge branch 'rs-bootsnap' into 'master'"

Closes #34134, #34106, and #34084

See merge request !12389

3 files changed, 0 insertions, 17 deletions

diff --git a/Gemfile b/Gemfile
index b1790b23dcd..84722026e2e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,7 +2,6 @@ source 'https://rubygems.org'
 
 gem 'rails', '4.2.8'
 gem 'rails-deprecated_sanitizer', '~> 1.0.3'
-gem 'bootsnap', '~> 1.0.0'
 
 # Responders respond_to and respond_with
 gem 'responders', '~> 2.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index bfd0498db35..6226c6bebdf 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -83,8 +83,6 @@ GEM
     bindata (2.3.5)
     binding_of_caller (0.7.2)
       debug_inspector (>= 0.0.1)
-    bootsnap (1.0.0)
-      msgpack (~> 1.0)
     bootstrap-sass (3.3.6)
       autoprefixer-rails (>= 5.2.1)
       sass (>= 3.3.4)
@@ -464,7 +462,6 @@ GEM
     minitest (5.7.0)
     mmap2 (2.2.6)
     mousetrap-rails (1.4.6)
-    msgpack (1.1.0)
     multi_json (1.12.1)
     multi_xml (0.6.0)
     multipart-post (2.0.0)
@@ -928,7 +925,6 @@ DEPENDENCIES
   benchmark-ips (~> 2.3.0)
   better_errors (~> 2.1.0)
   binding_of_caller (~> 0.7.2)
-  bootsnap (~> 1.0.0)
   bootstrap-sass (~> 3.3.0)
   brakeman (~> 3.6.0)
   browser (~> 2.2)
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
-)