Revert Revert "Merge branch 'jy-oauth-2' into 'master'"
What does this MR do and why?
Re-introduces changes made in this MR: !96595 (merged) That were then reverted here: !97957 (merged)
Changes between original MR and this MR
- Rationale behind reverting the original MR was the Group SAML QA tests showed failures. See QA failure here and issue for failure here.
- This commit contains the diff between !96595 (merged) and !97985 (merged)
- In the original MR,
omniauth-saml
was upgraded to2.1.0
. In this MR, we are upgrading toomniauth-saml
version2.0.0
instead. - This is because
2.1
upgradedruby-saml
to1.12.0
and that version bump was what caused GitLab's Group SAML feature to break. Specifically, there is a breaking change between2.0.0
and2.1.0
becauseissuer_id
is renamed tosp_entity_id
. See the diff here. - We are confident that Group SAML now works based on a local test of group SAML and a pipeline run of the E2E Group SAML QA test on this branch that is green: https://gitlab.com/gitlab-org/gitlab/-/pipelines/640383330
Screenshots or screen recordings
Screenshots are required for UI changes, and strongly recommended for all other merge requests.
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.
-
I have evaluated the MR acceptance checklist for this MR.
Edited by Jessie Young