Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
7d843f52
Commit
7d843f52
authored
Mar 25, 2021
by
Rajendra Kadam
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Reorder the regex to load files
parent
8dd75878
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
ee/lib/ee/gitlab/usage/metric_definition.rb
ee/lib/ee/gitlab/usage/metric_definition.rb
+1
-1
lib/gitlab/usage/metric_definition.rb
lib/gitlab/usage/metric_definition.rb
+1
-1
spec/lib/gitlab/usage/metric_spec.rb
spec/lib/gitlab/usage/metric_spec.rb
+1
-1
No files found.
ee/lib/ee/gitlab/usage/metric_definition.rb
View file @
7d843f52
...
...
@@ -11,7 +11,7 @@ module EE
override
:paths
def
paths
@ee_paths
||=
[
Rails
.
root
.
join
(
'ee'
,
'config'
,
'metrics'
,
'
*[^aggregates]
'
,
'*.yml'
)]
+
super
@ee_paths
||=
[
Rails
.
root
.
join
(
'ee'
,
'config'
,
'metrics'
,
'
[^aggregates]*
'
,
'*.yml'
)]
+
super
end
end
end
...
...
lib/gitlab/usage/metric_definition.rb
View file @
7d843f52
...
...
@@ -56,7 +56,7 @@ module Gitlab
class
<<
self
def
paths
@paths
||=
[
Rails
.
root
.
join
(
'config'
,
'metrics'
,
'
*[^aggregates]
'
,
'*.yml'
)]
@paths
||=
[
Rails
.
root
.
join
(
'config'
,
'metrics'
,
'
[^aggregates]*
'
,
'*.yml'
)]
end
def
definitions
(
skip_validation:
false
)
...
...
spec/lib/gitlab/usage/metric_spec.rb
View file @
7d843f52
...
...
@@ -5,7 +5,7 @@ require 'spec_helper'
RSpec
.
describe
Gitlab
::
Usage
::
Metric
do
describe
'#definition'
do
it
'returns key_path metric definiton'
do
expect
(
described_class
.
new
(
key_path:
'
counts.issues
'
).
definition
).
to
be_an
(
Gitlab
::
Usage
::
MetricDefinition
)
expect
(
described_class
.
new
(
key_path:
'
uuid
'
).
definition
).
to
be_an
(
Gitlab
::
Usage
::
MetricDefinition
)
end
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment