diff options
| author | DJ Mountney <dj@gitlab.com> | 2017-07-10 21:20:52 +0000 |
|---|---|---|
| committer | DJ Mountney <dj@gitlab.com> | 2017-07-10 21:20:52 +0000 |
| commit | e643c0db35617d2b0ba607708322e827c15ce132 (patch) | |
| tree | 2094291da16a3c4021176f7441b865970cfeccf8 /config/boot.rb | |
| parent | ba4250c119df661f32bc7e72b8001798464a9785 (diff) | |
| parent | 26b6e299e1c97b956306572c5c9f6c02f428bfd7 (diff) | |
| download | gitlab-ce-e643c0db35617d2b0ba607708322e827c15ce132.tar.gz | |
Merge branch 'master' into 'catch-redis-address-error'
# Conflicts:
# lib/gitlab/current_settings.rb
Diffstat (limited to 'config/boot.rb')
| -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' |