Skip to content

BE Add Gitlab.com gold trial callout to /billings

Luke Bennett requested to merge billings-gold-trial-callout into master

CE port: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/25482

What does this MR do?

  • Refactors callout helpers to render methods

  • Adds callout helper and ID for billing gold trial

  • Hides the callout if the current namespace is on a gold plan or trial.

  • Adds namespace plan matcher methods to Plan.

Table of MRs

CE EE
FE https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/25481 https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/9611
FE refactor dashboards https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/25483 https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/9644
FE refactor callout instantiation https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/25484 https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/9647
BE https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/25482 https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/9610
user_callout namespace migration https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/9807
user_callout namespace BE+FE https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/9809 
• master
    └── BE - billings-gold-trial-callout - ee!9610
        └── FE - billings-gold-trial-callout-fe - ee!9611
            ├── FE - refactor dashboards - billings-gold-trial-callout-fe-dashboard ee!9644
            ├── FE refactor callout instantiation - billings-gold-trial-callout-fe-persistent-callout - ee!9647
            └── BE - user_callout namespace migration - add-namespaces-to-callouts - ee!9807
                └── FE+BE user_callout namespace - billings-gold-trial-callout-namespace-callouts - ee!9809

This is the branch setup, it is also the merge order. Every branch can be merged into the new master created from merging its parent. This stops everything bunching up into a single feature branch before hitting master.

What are the relevant issue numbers?

Does this MR meet the acceptance criteria?

Edited by Luke Bennett

Merge request reports