Align eligible plans across all usage billing features

Context

From #587769, there are inconsistencies in how usage billing is handled for community programs (OSS, EDU, Startups) across different features.

Problem

The behavior across all features should be consistent:

  • GitLab usage dashboards
  • CustomersDot usage dashboards
  • On-demand terms acceptance
  • Usage notifications

Currently there are inconsistencies:

  1. GitLab credits dashboard on GitLab.com shows Usage billing disabled message for groups with community programs subscriptions, however the dashboard is accessible on Customers Portal by clicking on GitLab Credits dashboard button on the subscription card which shows buttons to accept on-demand billing and purchase monthly commitment.

  2. On-demand billing acceptance has inconsistent behavior:

    • Attempting to accept on-demand billing as a customer who has no paid purchases (no payment method on file) returns Payment method is required error message
    • If customer has a payment method on file (made a paid purchase), they can accept on-demand billing
    • There is at least one OSS subscription on Production where on-demand billing was accepted
  3. Eligible plans lists are different across features:

    • Usage billing uses gitlab_credits_eligible_plans
    • Overage acceptance and self-service use all_sm_base_plans and all_gitlab_com_base_plans
    • Comparison table of the eligible plans can be found in #15829

Expected Behavior

All features should have consistent behavior for community programs subscriptions:

  • Usage dashboards (both GitLab.com and CustomersDot) should show the same state
  • On-demand billing acceptance should work consistently
  • Eligible plans lists should be aligned across all features
  • Usage notifications should follow the same eligibility rules

Related Issues

  • #587769 - Support usage billing for programs (OSS, EDU, Startups)
  • #15829 - Align community programs requirement with current usage billing restrictions
  • #15831 - Enable self-service credits purchasing for community programs subscriptions
Edited Feb 04, 2026 by Sharmad Nachnolkar
Assignee Loading
Time tracking Loading