Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarin Jankovski <maxlazio@gmail.com>2017-07-10 18:29:15 +0300
committerMarin Jankovski <maxlazio@gmail.com>2017-07-10 18:29:15 +0300
commit97a6ec4aaa2aa809023dde897e8ad88642fbb967 (patch)
treed7994f74a6c6a8c954ae33c4bc7d504f0a65a414 /config/boot.rb
parent03b0fe6df908db9d9d71f9f1a8e1e492d2719524 (diff)
Revert "Merge branch 'update_bootsnap_1.1.1' into 'master'"
This reverts commit 83ec509ce43c56da601335de5b9ea4422c785560, reversing changes made to 57f0677ad854b7b17bd57e1e3b0ef542ce322b56.
Diffstat (limited to 'config/boot.rb')
-rw-r--r--config/boot.rb6
1 files changed, 0 insertions, 6 deletions
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'