Skip to content

[16.5 Backport] Fix Admin Mode bug in DeactivateDormantUsersWorker

Sharmad Nachnolkar requested to merge cherry-pick-460c393d-2 into 16-5-stable-ee

What does this MR do and why?

What does this MR do and why?

This MR backports the fix raised in this MR to 16.5 release.

Related to #431560 (closed) - bug that is being backported.

Related to https://gitlab.com/gitlab-org/release/tasks/-/issues/7369 - Backport request.

MR acceptance checklist

This checklist encourages us to confirm any changes have been analyzed to reduce risks in quality, performance, reliability, security, and maintainability.

  • This MR is backporting a bug fix, documentation update, or spec fix, previously merged in the default branch.
  • The MR that fixed the bug on the default branch has been deployed to GitLab.com (not applicable for documentation or spec changes).
  • This MR has a severity label assigned (if applicable).
  • Set the milestone of the merge request to match the target backport branch version.
  • This MR has been approved by a maintainer (only one approval is required).
  • Ensure the e2e:package-and-test-ee job has either succeeded or been approved by a Software Engineer in Test.

Note to the merge request author and maintainer

If you have questions about the patch release process, please:

[#releases]: https://gitlab.slack.com/archives/C0XM5UU6Bpate in the discussion. -->

Merge branch 'codyw-fix-dormantuser-cron' into 'master'

Fix Admin Mode bug in DeactivateDormantUsersWorker

See merge request !136907 (merged)

Merged-by: Alper Akgun aakgun@gitlab.com Approved-by: Josianne Hyson jhyson@gitlab.com Approved-by: Smriti Garg sgarg@gitlab.com Reviewed-by: Josianne Hyson jhyson@gitlab.com Reviewed-by: Huzaifa Iftikhar hiftikhar@gitlab.com Co-authored-by: Cody West cwest@gitlab.com Co-authored-by: Josianne Hyson jhyson@gitlab.com

(cherry picked from commit 460c393d)

c889133c Skip DeactivateService authorization in cron e9f51558 Switch to session bypass 0db4f4bc Add admin mode user deactivation tests 5f3e44ad Call original for better testing 67d4689b Remove authorization skip efda2a7a Apply review suggestions

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.

MR acceptance checklist

This checklist encourages us to confirm any changes have been analyzed to reduce risks in quality, performance, reliability, security, and maintainability.

Edited by Sharmad Nachnolkar

Merge request reports