diff options
| author | Achilleas Pipinellis <axilleas@axilleas.me> | 2017-02-02 19:33:33 +0000 |
|---|---|---|
| committer | Achilleas Pipinellis <axilleas@axilleas.me> | 2017-02-02 19:33:33 +0000 |
| commit | c846d3610912bed47404b31c5bc2f190ecbdb93b (patch) | |
| tree | dd98634af5c2796a6435afe6c1e2a7254d981c8b /spec/spec_helper.rb | |
| parent | bb06183d3d8725b328d9f6f05bf5c4a74b93fb36 (diff) | |
| parent | b2e5c423d7080644132c70650bc707feb41cd5a9 (diff) | |
| download | gitlab-ce-update-import-export-docs.tar.gz | |
Merge branch 'master' into 'update-import-export-docs'update-import-export-docs
# Conflicts:
# doc/user/project/settings/import_export.md
Diffstat (limited to 'spec/spec_helper.rb')
| -rw-r--r-- | spec/spec_helper.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index e160c11111b..ab38dac65c5 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -9,6 +9,10 @@ require 'rspec/rails' require 'shoulda/matchers' require 'rspec/retry' +if ENV['RSPEC_PROFILING_POSTGRES_URL'] || ENV['RSPEC_PROFILING'] + require 'rspec_profiling/rspec' +end + if ENV['CI'] && !ENV['NO_KNAPSACK'] require 'knapsack' Knapsack::Adapters::RSpecAdapter.bind |