diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-19 18:06:24 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-19 18:06:24 +0300 |
| commit | 88542a5e9613c8442a982e65ad5cf13eb33bc541 (patch) | |
| tree | 11a65d86e623b443b8a2976cc93cff360e2da8a2 /spec/spec_helper.rb | |
| parent | b570d73ecd31e2ca9cf8c2f1adb056edf2869477 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/spec_helper.rb')
| -rw-r--r-- | spec/spec_helper.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index d7533f99683..2afe80f455e 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -18,7 +18,6 @@ rspec_profiling_is_configured = ENV['RSPEC_PROFILING_POSTGRES_URL'].present? || ENV['RSPEC_PROFILING'] branch_can_be_profiled = - ENV['GITLAB_DATABASE'] == 'postgresql' && (ENV['CI_COMMIT_REF_NAME'] == 'master' || ENV['CI_COMMIT_REF_NAME'] =~ /rspec-profile/) |