diff options
| author | Pawel Chojnacki <pawel@chojnacki.ws> | 2017-06-22 15:05:52 +0200 |
|---|---|---|
| committer | Pawel Chojnacki <pawel@chojnacki.ws> | 2017-06-22 15:05:52 +0200 |
| commit | 97c42df3b804a37e659c3cda6bd8a52570f31366 (patch) | |
| tree | 97c38db7f71a93a7b0db5ca2c682d6d17479cbdb /config/boot.rb | |
| parent | 3833f1dd84dfec844443a5b1d9ba2bd2b911c0bc (diff) | |
| parent | 11716f310dcc495600f5a17e08456a1abb296482 (diff) | |
| download | gitlab-ce-97c42df3b804a37e659c3cda6bd8a52570f31366.tar.gz | |
Merge remote-tracking branch 'upstream/master' into 28717-additional-metrics-review-branch28717-additional-metrics-review-branch
Diffstat (limited to 'config/boot.rb')
| -rw-r--r-- | config/boot.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/config/boot.rb b/config/boot.rb index db5ab918021..16de55d7a86 100644 --- a/config/boot.rb +++ b/config/boot.rb @@ -6,7 +6,9 @@ ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__) require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE']) # set default directory for multiproces metrics gathering -ENV['prometheus_multiproc_dir'] ||= 'tmp/prometheus_multiproc_dir' +if ENV['RAILS_ENV'] == 'development' || ENV['RAILS_ENV'] == 'test' + ENV['prometheus_multiproc_dir'] ||= 'tmp/prometheus_multiproc_dir' +end # Default Bootsnap configuration from https://github.com/Shopify/bootsnap#usage require 'bootsnap' |