summaryrefslogtreecommitdiff
path: root/config/initializers
diff options
context:
space:
mode:
authorPawel Chojnacki <pawel@chojnacki.ws>2017-07-25 14:19:09 +0200
committerPawel Chojnacki <pawel@chojnacki.ws>2017-07-25 14:19:09 +0200
commit2286879583580861109207c05aa4fae1729a02b6 (patch)
tree6f7f862584c265866efb40afc3fd9c1458eff7d5 /config/initializers
parentd95e6da0d582cd4b0d333b3b6a1bfa3a565b874e (diff)
downloadgitlab-ce-2286879583580861109207c05aa4fae1729a02b6.tar.gz
Ensure test files are deleted after tests
Diffstat (limited to 'config/initializers')
-rw-r--r--config/initializers/7_prometheus_metrics.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/config/initializers/7_prometheus_metrics.rb b/config/initializers/7_prometheus_metrics.rb
index 987324a86c9..a2f8421f5d7 100644
--- a/config/initializers/7_prometheus_metrics.rb
+++ b/config/initializers/7_prometheus_metrics.rb
@@ -6,7 +6,7 @@ Prometheus::Client.configure do |config|
config.initial_mmap_file_size = 4 * 1024
config.multiprocess_files_dir = ENV['prometheus_multiproc_dir']
- if Rails.env.development? && Rails.env.test?
+ if Rails.env.development? || Rails.env.test?
config.multiprocess_files_dir ||= Rails.root.join('tmp/prometheus_multiproc_dir')
end
end