WIP: Resolve "GitLab CE features to work with unlicensed EE instance"
What does this MR do?
-
Block changes only when the license (not trial) has expired. -
No GitLab EE features should work when there isn't a regular or trial license(no action required here: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2158#note_33240909) -
Once the trial license expires, GitLab CE features should continue to work -
Once a trial license expires, there should be a notification and link to contact sales to purchase a full EE license -
If a regular license expires, the server should no longer function and require a renewal (this is current EE behaviour)
Are there points in the code the reviewer needs to double check?
Why was this MR needed?
Screenshots (if relevant)
Does this MR meet the acceptance criteria?
-
Changelog entry added, if necessary -
Documentation created/updated -
API support added - Tests
-
Added for this feature/bug -
All builds are passing
-
-
Conform by the merge request performance guides -
Conform by the style guides -
Branch has no merge conflicts with master
(if it does - rebase it please) -
Squashed related commits together
What are the relevant issue numbers?
Closes #2500 (closed)
Merge request reports
Activity
added 1 commit
- d8844598 - Only block changes when a regular license has expired
added 1 commit
- 164af363 - Only block changes when a regular license has expired
marked the checklist item Block changes only when the license (not trial) has expired. as completed
added 1 commit
- 4de21787 - Block EE features when the trial period has ended
No GitLab EE features should work when there isn't a regular or trial license
@oswaldo if we don't have a license key neither of the EE features are going to work given we don't have how to read the
plan
code and theadd_ons
list (for legacy subscriptions), so basically I have to do nothing to achieve this, am I right?@rdavila Yep, if there's no
plan
, or noLicense.current
no EE feature will work.added 1 commit
- 013a1c8b - Remove broadcast message when there is no license present
added 2 commits
Hi @grzesiek, I'm not sure if we may need to update some of the QA tests now that we don't need a license key in order to use EE.
@rdavila Thanks for heads up! It appears that we don need license key in GitLab QA tests now, but I think that since we already have it, we can keep it in order to test EE-only features. Adding license key to EE QA tests show not break anything, right?
Adding license key to EE QA tests show not break anything, right?
@grzesiek yeah, it should be working fine as usual.
added 1 commit
- e2e49c11 - Update URL to purchase a license for EE [ci skip]
Closing in favor of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2266
added Enterprise Edition label