Fixes Restricted access gitlab.com bugs
What does this MR do and why?
This merge request introduces changes to handle seat management and user invitations more effectively. The update improves the handling of existing users and bot users in the member creation and update processes for Saas. Specifically, it allows updating access levels for already billable users and bot users without rejecting them due to seat limitations.
Fixes Restricted access gitlab.com bugs
- Service Bot users are not blocked by Restricted access feature
- Emails passed for existing user in member invite flow gets handled correctly for Restricted access
EE: true Changelog: fixed
References
Please include cross links to any resources that are relevant to this MR. This will give reviewers and future readers helpful context to give an efficient review of the changes introduced.
- https://gitlab.com/gitlab-org/gitlab/-/issues/515534
- https://gitlab.com/gitlab-org/gitlab/-/issues/514400
MR acceptance checklist
Please evaluate this MR against the MR acceptance checklist. It helps you analyze changes to reduce risks in quality, performance, reliability, security, and maintainability.
Screenshots or screen recordings
Screenshots are required for UI changes, and strongly recommended for all other merge requests.
Before | After |
---|---|
How to set up and validate locally
Numbered steps to set up and validate the change are strongly suggested.
Merge request reports
Activity
changed milestone to %17.9
assigned to @suraj_tripathy
added pipelinetier-1 label
cc: @jagood to get your eyes on this as well, once vij is done.
Edited by Suraj Tripathi@suraj_tripathy this seems good to me!
just left non-blocking question/thoughts@suraj_tripathy Is this typefeature? This is for BSO for
gitlab.com
, which has been released, right? It is Beta though... do we tend to call it typefeature rather than typebug for a Beta feature?At any rate, this LGTM, so I'll let you adjust the label if we need to, and then you can merge this yourself.
I had a few questions and comments, but the only blocker I see is the possibility that we need to change the label.
do we tend to call it typefeature rather than typebug for a Beta feature?
I am not certain here, I am okay to mark this as typebug.. cc: @alex_martin what do you think would bug fix or feature enhancement?
I'll go ahead and set this to merge, we can probably fix the label even once its merged?
Edited by Suraj TripathiI'll go ahead and set this to merge, we can probably fix the label even once its merged?
I would think so. Right?
I'm also curious to hear what @alex_martin thinks here.
I think typebug is fine. This is not something we planned document as a
known issue
, so I think bug is right. But anyknown issues
that we solve I think would be typefeature
requested review from @vij
added backend label
Reviewer roulette
Category Reviewer Maintainer backend @panoskanell
(UTC+2, 3.5 hours behind author)
@pedropombeiro
(UTC+1, 4.5 hours behind author)
Please refer to documentation page for guidance on how you can benefit from the Reviewer Roulette, or use the GitLab Review Workload Dashboard to find other available reviewers.
If needed, you can retry the
danger-review
job that generated this comment.Generated by
DangerEdited by ****requested review from @jagood
added 54 commits
-
e72becbb...d33db57f - 52 commits from branch
master
- 4ea3a3a6 - Fixes Restricted access gitlab.com bugs
- 9abe5c24 - Fix broken spec
-
e72becbb...d33db57f - 52 commits from branch
- Resolved by Suraj Tripathi
- Resolved by Suraj Tripathi
added pipeline:mr-approved label
added pipelinetier-3 pipeline:run-e2e-omnibus-once labels and removed pipelinetier-1 label
Before you set this MR to auto-merge
This merge request will progress on pipeline tiers until it reaches the last tier: pipelinetier-3. We will trigger a new pipeline for each transition to a higher tier.
Before you set this MR to auto-merge, please check the following:
- You are the last maintainer of this merge request
- The latest pipeline for this merge request is pipelinetier-3 (You can find which tier it is in the pipeline name)
- This pipeline is recent enough (created in the last 8 hours)
If all the criteria above apply, please set auto-merge for this merge request.
See pipeline tiers and merging a merge request for more details.
E2E Test Result Summary
allure-report-publisher
generated test report!e2e-test-on-cng:
test report for 9abe5c24expand test summary
+------------------------------------------------------------------+ | suites summary | +-------------+--------+--------+---------+-------+-------+--------+ | | passed | failed | skipped | flaky | total | result | +-------------+--------+--------+---------+-------+-------+--------+ | Verify | 39 | 0 | 20 | 0 | 59 | ✅ | | Create | 128 | 0 | 22 | 0 | 150 | ✅ | | Secure | 2 | 0 | 5 | 0 | 7 | ✅ | | Govern | 69 | 0 | 10 | 0 | 79 | ✅ | | Data Stores | 29 | 0 | 10 | 0 | 39 | ✅ | | Plan | 78 | 0 | 8 | 0 | 86 | ✅ | | Package | 28 | 0 | 15 | 0 | 43 | ✅ | | Monitor | 8 | 0 | 12 | 0 | 20 | ✅ | | Fulfillment | 2 | 0 | 7 | 0 | 9 | ✅ | | Configure | 0 | 0 | 3 | 0 | 3 | ➖ | | ModelOps | 0 | 0 | 1 | 0 | 1 | ➖ | | Release | 5 | 0 | 1 | 0 | 6 | ✅ | | Ai-powered | 0 | 0 | 2 | 0 | 2 | ➖ | | Manage | 1 | 0 | 9 | 0 | 10 | ✅ | | Analytics | 2 | 0 | 0 | 0 | 2 | ✅ | | Growth | 0 | 0 | 2 | 0 | 2 | ➖ | +-------------+--------+--------+---------+-------+-------+--------+ | Total | 391 | 0 | 127 | 0 | 518 | ✅ | +-------------+--------+--------+---------+-------+-------+--------+
e2e-test-on-gdk:
test report for 9abe5c24expand test summary
+------------------------------------------------------------------+ | suites summary | +-------------+--------+--------+---------+-------+-------+--------+ | | passed | failed | skipped | flaky | total | result | +-------------+--------+--------+---------+-------+-------+--------+ | Data Stores | 33 | 0 | 10 | 0 | 43 | ✅ | | Package | 24 | 0 | 14 | 0 | 38 | ✅ | | Create | 135 | 0 | 23 | 0 | 158 | ✅ | | Govern | 78 | 0 | 14 | 0 | 92 | ✅ | | Plan | 82 | 0 | 8 | 0 | 90 | ✅ | | Monitor | 8 | 0 | 12 | 0 | 20 | ✅ | | Fulfillment | 2 | 0 | 7 | 0 | 9 | ✅ | | Manage | 1 | 0 | 9 | 0 | 10 | ✅ | | Secure | 4 | 0 | 3 | 0 | 7 | ✅ | | Verify | 51 | 0 | 21 | 0 | 72 | ✅ | | Configure | 0 | 0 | 3 | 0 | 3 | ➖ | | ModelOps | 0 | 0 | 1 | 0 | 1 | ➖ | | Ai-powered | 0 | 0 | 2 | 0 | 2 | ➖ | | Analytics | 2 | 0 | 0 | 0 | 2 | ✅ | | Release | 5 | 0 | 1 | 0 | 6 | ✅ | | Growth | 0 | 0 | 2 | 0 | 2 | ➖ | +-------------+--------+--------+---------+-------+-------+--------+ | Total | 425 | 0 | 130 | 0 | 555 | ✅ | +-------------+--------+--------+---------+-------+-------+--------+
Edited by ****