Commit 01891edd authored by Luis Mejia's avatar Luis Mejia

Add suggested changes

parent ec0e2715
...@@ -53,10 +53,7 @@ module Gitlab ...@@ -53,10 +53,7 @@ module Gitlab
end end
def distribution def distribution
value = [] (ee? ? ['- ee'] : ['- ce', '- ee']).join("\n")
value << '- ce' unless ee?
value << '- ee'
value.join("\n")
end end
def tier def tier
......
--- ---
# See Usage Ping metrics dictionary docs https://docs.gitlab.com/ee/development/usage_ping/metrics_dictionary.html
key_path: counts_weekly.test_metric key_path: counts_weekly.test_metric
name: test metric name name: test metric name
description: description:
......
...@@ -38,7 +38,7 @@ RSpec.describe Gitlab::UsageMetricDefinitionGenerator do ...@@ -38,7 +38,7 @@ RSpec.describe Gitlab::UsageMetricDefinitionGenerator do
end end
end end
context 'with ee is true' do context 'with ee option' do
let(:sample_filename) { 'sample_metric_with_ee.yml' } let(:sample_filename) { 'sample_metric_with_ee.yml' }
let(:metric_definition_path) { Dir.glob(File.join(temp_dir, 'ee/config/metrics/counts_7d/*_test_metric.yml')).first } let(:metric_definition_path) { Dir.glob(File.join(temp_dir, 'ee/config/metrics/counts_7d/*_test_metric.yml')).first }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment