diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-19 11:27:35 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-19 11:27:35 +0300 |
commit | 7e9c479f7de77702622631cff2628a9c8dcbc627 (patch) | |
tree | c8f718a08e110ad7e1894510980d2155a6549197 /app/graphql/resolvers/admin | |
parent | e852b0ae16db4052c1c567d9efa4facc81146e88 (diff) |
Add latest changes from gitlab-org/gitlab@13-6-stable-eev13.6.0-rc42
Diffstat (limited to 'app/graphql/resolvers/admin')
-rw-r--r-- | app/graphql/resolvers/admin/analytics/instance_statistics/measurements_resolver.rb | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/app/graphql/resolvers/admin/analytics/instance_statistics/measurements_resolver.rb b/app/graphql/resolvers/admin/analytics/instance_statistics/measurements_resolver.rb index aea3afa8ec5..9bac9f222ab 100644 --- a/app/graphql/resolvers/admin/analytics/instance_statistics/measurements_resolver.rb +++ b/app/graphql/resolvers/admin/analytics/instance_statistics/measurements_resolver.rb @@ -13,10 +13,20 @@ module Resolvers required: true, description: 'The type of measurement/statistics to retrieve' - def resolve(identifier:) + argument :recorded_after, Types::TimeType, + required: false, + description: 'Measurement recorded after this date' + + argument :recorded_before, Types::TimeType, + required: false, + description: 'Measurement recorded before this date' + + def resolve(identifier:, recorded_before: nil, recorded_after: nil) authorize! ::Analytics::InstanceStatistics::Measurement + .recorded_after(recorded_after) + .recorded_before(recorded_before) .with_identifier(identifier) .order_by_latest end |