diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-07-10 16:38:15 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-07-10 16:38:15 +0000 |
| commit | 31ada792621f17ab7f4f7475405ddd1ec9e9673a (patch) | |
| tree | 81624045eb9bb0630b002562a6c10d70a938e19a /config | |
| parent | 664bc371f309092de2915585af69a78efe69b27d (diff) | |
| parent | 97a6ec4aaa2aa809023dde897e8ad88642fbb967 (diff) | |
| download | gitlab-ce-31ada792621f17ab7f4f7475405ddd1ec9e9673a.tar.gz | |
Merge branch 'revert_bootsnap' into 'master'
Revert "Merge branch 'update_bootsnap_1.1.1' into 'master'"
See merge request !12755
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' |