diff options
| author | Marin Jankovski <maxlazio@gmail.com> | 2017-07-10 17:29:15 +0200 |
|---|---|---|
| committer | Marin Jankovski <maxlazio@gmail.com> | 2017-07-10 17:29:15 +0200 |
| commit | 97a6ec4aaa2aa809023dde897e8ad88642fbb967 (patch) | |
| tree | d7994f74a6c6a8c954ae33c4bc7d504f0a65a414 /config | |
| parent | 03b0fe6df908db9d9d71f9f1a8e1e492d2719524 (diff) | |
| download | gitlab-ce-97a6ec4aaa2aa809023dde897e8ad88642fbb967.tar.gz | |
Revert "Merge branch 'update_bootsnap_1.1.1' into 'master'"
This reverts commit 83ec509ce43c56da601335de5b9ea4422c785560, reversing
changes made to 57f0677ad854b7b17bd57e1e3b0ef542ce322b56.
Diffstat (limited to 'config')
| -rw-r--r-- | config/boot.rb | 6 |
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' |