kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Add latest changes from gitlab-org/gitlab@master

Browse source
This commit is contained in:
GitLab Bot 2020-11-07 06:08:56 +00:00
parent ce5fc4c88d
commit 2b085a8ae1
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/gitlab/usage_data_counters/hll_redis_counter.rb
View file

@ -15,9 +15,9 @@ module Gitlab
CategoryMismatch = Class.new(EventError)
UnknownAggregationOperator = Class.new(EventError)
KNOWN_EVENTS_PATH = 'lib/gitlab/usage_data_counters/known_events/*.yml'
KNOWN_EVENTS_PATH = File.expand_path('known_events/*.yml', __dir__)
ALLOWED_AGGREGATIONS = %i(daily weekly).freeze
AGGREGATED_METRICS_PATH = 'lib/gitlab/usage_data_counters/aggregated_metrics/*.yml'
AGGREGATED_METRICS_PATH = File.expand_path('aggregated_metrics/*.yml', __dir__)
ALLOWED_METRICS_AGGREGATIONS = %w[ANY].freeze
# Track event on entity_id
@ -156,7 +156,7 @@ module Gitlab
end
def load_yaml_from_path(path)
YAML.safe_load(File.read(Rails.root.join(path)))&.map(&:with_indifferent_access)
YAML.safe_load(File.read(path))&.map(&:with_indifferent_access)
end
def known_events_names