Skip to content

Make default_max_count query uses expires_at

Mark Chao requested to merge 326931-fix-default_max_count into master

What does this MR do?

Make default_max_count query uses expires_at instead of current time, when timestamp is not provided.

When timestamp is not provided, historical_data would use current time, while default_max_count would use license expires_at (see https://gitlab.com/gitlab-org/gitlab/-/blob/3f139e5d0925b5287d07bdd0dcbc26c98c8caeff/ee/app/models/license.rb#L694)

This commit fix default_max_count to align with historical_data

Does this MR meet the acceptance criteria?

Conformity

Availability and Testing

Security

If this MR contains changes to processing or storing of credentials or tokens, authorization and authentication methods and other items described in the security review guidelines:

  • Label as security and @ mention @gitlab-com/gl-security/appsec
  • The MR includes necessary changes to maintain consistency between UI, API, email, or other methods
  • Security reports checked/validated by a reviewer from the AppSec team

Related to #326931

Edited by Mark Chao

Merge request reports