Commit 63f41d6e authored by Robert Speicher's avatar Robert Speicher

Merge branch 'psk-fix-instrumentation-class-generator-ee-path' into 'master'

Fix instrumentation generator to not use EE module path

See merge request gitlab-org/gitlab!75550
parents ef0df760 b89abdb0
...@@ -5,9 +5,9 @@ require 'rails/generators' ...@@ -5,9 +5,9 @@ require 'rails/generators'
module Gitlab module Gitlab
class UsageMetricGenerator < Rails::Generators::Base class UsageMetricGenerator < Rails::Generators::Base
CE_DIR = 'lib/gitlab/usage/metrics/instrumentations' CE_DIR = 'lib/gitlab/usage/metrics/instrumentations'
EE_DIR = 'ee/lib/ee/gitlab/usage/metrics/instrumentations' EE_DIR = 'ee/lib/gitlab/usage/metrics/instrumentations'
SPEC_CE_DIR = 'spec/lib/gitlab/usage/metrics/instrumentations' SPEC_CE_DIR = 'spec/lib/gitlab/usage/metrics/instrumentations'
SPEC_EE_DIR = 'ee/spec/lib/ee/gitlab/usage/metrics/instrumentations' SPEC_EE_DIR = 'ee/spec/lib/gitlab/usage/metrics/instrumentations'
ALLOWED_SUPERCLASSES = { ALLOWED_SUPERCLASSES = {
generic: 'Generic', generic: 'Generic',
......
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