diff options
author | Rémy Coutable <remy@rymai.me> | 2017-02-10 17:26:44 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2017-02-10 17:26:44 +0000 |
commit | 01c2a50fa2cfb09996bf5ce1cfe7cc319df68ee3 (patch) | |
tree | a423d2384b2dddb4418127f807430b73e5f4a6c5 | |
parent | 6cbfe1396d6627f156f109f414215db426b846ad (diff) | |
parent | fd38397027ff7a22915e245fad47959bb2b73f4d (diff) | |
download | gitlab-ce-01c2a50fa2cfb09996bf5ce1cfe7cc319df68ee3.tar.gz |
Merge branch 'rspec-profiling-branch-name-in-ci' into 'master'
rspec_profiling: Discover the correct branch name in GitLab CI
See merge request !9134
-rw-r--r-- | config/initializers/rspec_profiling.rb | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/config/initializers/rspec_profiling.rb b/config/initializers/rspec_profiling.rb index f462e654b2c..0ef9f51e5cf 100644 --- a/config/initializers/rspec_profiling.rb +++ b/config/initializers/rspec_profiling.rb @@ -4,6 +4,12 @@ module RspecProfilingConnection end end +module RspecProfilingGitBranchCi + def branch + ENV['CI_BUILD_REF_NAME'] || super + end +end + if Rails.env.test? RspecProfiling.configure do |config| if ENV['RSPEC_PROFILING_POSTGRES_URL'] @@ -11,4 +17,6 @@ if Rails.env.test? config.collector = RspecProfiling::Collectors::PSQL end end + + RspecProfiling::VCS::Git.prepend(RspecProfilingGitBranchCi) if ENV.has_key?('CI') end |