From 97a6ec4aaa2aa809023dde897e8ad88642fbb967 Mon Sep 17 00:00:00 2001
From: Marin Jankovski <maxlazio@gmail.com>
Date: Mon, 10 Jul 2017 17:29:15 +0200
Subject: Revert "Merge branch 'update_bootsnap_1.1.1' into 'master'"

This reverts commit 83ec509ce43c56da601335de5b9ea4422c785560, reversing
changes made to 57f0677ad854b7b17bd57e1e3b0ef542ce322b56.
---
 Gemfile                                         | 1 -
 Gemfile.lock                                    | 4 ----
 changelogs/unreleased/update_bootsnap_1-1-1.yml | 4 ----
 config/boot.rb                                  | 6 ------
 4 files changed, 15 deletions(-)
 delete mode 100644 changelogs/unreleased/update_bootsnap_1-1-1.yml

diff --git a/Gemfile b/Gemfile
index 2c248a45175..233a50c6e47 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.1'
 
 # Responders respond_to and respond_with
 gem 'responders', '~> 2.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index f356024506c..deaf3ded2f9 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.1.1)
-      msgpack (~> 1.0)
     bootstrap-sass (3.3.6)
       autoprefixer-rails (>= 5.2.1)
       sass (>= 3.3.4)
@@ -465,7 +463,6 @@ GEM
     minitest (5.7.0)
     mmap2 (2.2.7)
     mousetrap-rails (1.4.6)
-    msgpack (1.1.0)
     multi_json (1.12.1)
     multi_xml (0.6.0)
     multipart-post (2.0.0)
@@ -930,7 +927,6 @@ DEPENDENCIES
   benchmark-ips (~> 2.3.0)
   better_errors (~> 2.1.0)
   binding_of_caller (~> 0.7.2)
-  bootsnap (~> 1.1)
   bootstrap-sass (~> 3.3.0)
   bootstrap_form (~> 2.7.0)
   brakeman (~> 3.6.0)
diff --git a/changelogs/unreleased/update_bootsnap_1-1-1.yml b/changelogs/unreleased/update_bootsnap_1-1-1.yml
deleted file mode 100644
index 9ecfe4b60c8..00000000000
--- a/changelogs/unreleased/update_bootsnap_1-1-1.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Bump bootsnap to 1.1.1
-merge_request: 12425
-author: @blackst0ne
diff --git a/config/boot.rb b/config/boot.rb
index 02baeab29ab..2d01092acd5 100644
--- a/config/boot.rb
+++ b/config/boot.rb
@@ -5,12 +5,6 @@ ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
 
 require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
 
-begin
-  require 'bootsnap/setup'
-rescue SystemCallError => exception
-  $stderr.puts "WARNING: Bootsnap failed to setup: #{exception.message}"
-end
-
 # set default directory for multiproces metrics gathering
 if ENV['RAILS_ENV'] == 'development' || ENV['RAILS_ENV'] == 'test'
   ENV['prometheus_multiproc_dir'] ||= 'tmp/prometheus_multiproc_dir'
-- 
cgit v1.2.1