Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2017-03-27 16:31:05 +0300
committerSean McGivern <sean@mcgivern.me.uk>2017-03-27 16:31:05 +0300
commite248ec660e0b61bd3ed29bce4fe02af1110acc59 (patch)
tree33185a1608b3ebbbd7608ece9c97dba4ceaf5601 /config
parent40e3a70165a97526edc0caee228bc7b75f62534c (diff)
parente0e208abae3aacb4a8ad7fa8fdf8d8dd4ea14c4c (diff)
Merge branch '29787-monitor-ee-rspec-tests-separately' into 'master'
Resolve "Consider tracking the EE test suite with `rspec_profiling`" Closes #29787 See merge request !10226
Diffstat (limited to 'config')
-rw-r--r--config/initializers/rspec_profiling.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/config/initializers/rspec_profiling.rb b/config/initializers/rspec_profiling.rb
index 70177995356..764c067c6f0 100644
--- a/config/initializers/rspec_profiling.rb
+++ b/config/initializers/rspec_profiling.rb
@@ -7,7 +7,11 @@ module RspecProfilingExt
module Git
def branch
- ENV['CI_COMMIT_REF_NAME'] || super
+ if ENV['CI_COMMIT_REF_NAME']
+ "#{defined?(Gitlab::License) ? 'ee' : 'ce'}:#{ENV['CI_COMMIT_REF_NAME']}"
+ else
+ super
+ end
end
end