From 4bc2eba151ea2e834fbf9d510ac3b3adfedde885 Mon Sep 17 00:00:00 2001 From: ngala Date: Thu, 7 Aug 2025 11:43:35 -0400 Subject: [PATCH 1/3] Default enable ff_oauth_redirect_to_sso_login Related: https://gitlab.com/gitlab-org/gitlab/-/issues/550194 Changelog: added EE: true --- doc/api/oauth2.md | 2 ++ doc/integration/oauth_provider.md | 1 + doc/user/project/pages/pages_access_control.md | 1 + ee/config/feature_flags/beta/ff_oauth_redirect_to_sso_login.yml | 2 +- 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/doc/api/oauth2.md b/doc/api/oauth2.md index 7f76f29a8133ea..b637e27ced1122 100644 --- a/doc/api/oauth2.md +++ b/doc/api/oauth2.md @@ -95,6 +95,7 @@ authorization with each flow. {{< history >}} - Group SAML SSO support for OAuth applications [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/461212) in GitLab 18.2 [with a flag](../administration/feature_flags/_index.md) named `ff_oauth_redirect_to_sso_login`. Disabled by default. +- [Enabled](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/200682) Group SAML SSO support for OAuth applications in GitLab 18.3. {{< /history >}} @@ -199,6 +200,7 @@ You can now make requests to the API with the access token. {{< history >}} - Group SAML SSO support for OAuth applications [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/461212) in GitLab 18.2 [with a flag](../administration/feature_flags/_index.md) named `ff_oauth_redirect_to_sso_login`. Disabled by default. +- [Enabled](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/200682) Group SAML SSO support for OAuth applications in GitLab 18.3. {{< /history >}} diff --git a/doc/integration/oauth_provider.md b/doc/integration/oauth_provider.md index 68000a81179414..1dc7f8814bbd50 100644 --- a/doc/integration/oauth_provider.md +++ b/doc/integration/oauth_provider.md @@ -8,6 +8,7 @@ title: Configure GitLab as an OAuth 2.0 authentication identity provider {{< history >}} - Group SAML SSO support for OAuth applications [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/461212) in GitLab 18.2 [with a flag](../administration/feature_flags/_index.md) named `ff_oauth_redirect_to_sso_login`. Disabled by default. +- [Enabled](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/200682) Group SAML SSO support for OAuth applications in GitLab 18.3. {{< /history >}} diff --git a/doc/user/project/pages/pages_access_control.md b/doc/user/project/pages/pages_access_control.md index 32f9630cd27bdc..fa6618a1d0c06c 100644 --- a/doc/user/project/pages/pages_access_control.md +++ b/doc/user/project/pages/pages_access_control.md @@ -15,6 +15,7 @@ title: GitLab Pages access control {{< history >}} - Group SAML SSO support for Pages [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/326288) in GitLab 18.2 [with a flag](../../../administration/feature_flags/_index.md) named `ff_oauth_redirect_to_sso_login`. Disabled by default. +- [Enabled](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/200682) Group SAML SSO support for Pages in GitLab 18.3. {{< /history >}} diff --git a/ee/config/feature_flags/beta/ff_oauth_redirect_to_sso_login.yml b/ee/config/feature_flags/beta/ff_oauth_redirect_to_sso_login.yml index 1b33f82981bc05..f04a6c58bcdfa4 100644 --- a/ee/config/feature_flags/beta/ff_oauth_redirect_to_sso_login.yml +++ b/ee/config/feature_flags/beta/ff_oauth_redirect_to_sso_login.yml @@ -7,4 +7,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/550194 milestone: '18.2' group: group::authentication type: beta -default_enabled: false +default_enabled: true -- GitLab From 54955b587360d1aaf002e832421fa23f581cc499 Mon Sep 17 00:00:00 2001 From: Marcin Sedlak-Jakubowski Date: Wed, 13 Aug 2025 20:50:19 +0200 Subject: [PATCH 2/3] Improve history text --- doc/api/oauth2.md | 4 ++-- doc/integration/oauth_provider.md | 2 +- doc/user/project/pages/pages_access_control.md | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/api/oauth2.md b/doc/api/oauth2.md index b637e27ced1122..4509fda81b7790 100644 --- a/doc/api/oauth2.md +++ b/doc/api/oauth2.md @@ -95,7 +95,7 @@ authorization with each flow. {{< history >}} - Group SAML SSO support for OAuth applications [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/461212) in GitLab 18.2 [with a flag](../administration/feature_flags/_index.md) named `ff_oauth_redirect_to_sso_login`. Disabled by default. -- [Enabled](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/200682) Group SAML SSO support for OAuth applications in GitLab 18.3. +- Group SAML SSO support for OAuth applications [enabled on GitLab Self-Managed and GitLab Dedicated](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/200682) in GitLab 18.3. {{< /history >}} @@ -200,7 +200,7 @@ You can now make requests to the API with the access token. {{< history >}} - Group SAML SSO support for OAuth applications [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/461212) in GitLab 18.2 [with a flag](../administration/feature_flags/_index.md) named `ff_oauth_redirect_to_sso_login`. Disabled by default. -- [Enabled](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/200682) Group SAML SSO support for OAuth applications in GitLab 18.3. +- Group SAML SSO support for OAuth applications [enabled](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/200682) in GitLab 18.3. {{< /history >}} diff --git a/doc/integration/oauth_provider.md b/doc/integration/oauth_provider.md index 1dc7f8814bbd50..f203555eab7bbe 100644 --- a/doc/integration/oauth_provider.md +++ b/doc/integration/oauth_provider.md @@ -8,7 +8,7 @@ title: Configure GitLab as an OAuth 2.0 authentication identity provider {{< history >}} - Group SAML SSO support for OAuth applications [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/461212) in GitLab 18.2 [with a flag](../administration/feature_flags/_index.md) named `ff_oauth_redirect_to_sso_login`. Disabled by default. -- [Enabled](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/200682) Group SAML SSO support for OAuth applications in GitLab 18.3. +- Group SAML SSO support for OAuth applications [enabled on GitLab Self-Managed and GitLab Dedicated](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/200682) in GitLab 18.3. {{< /history >}} diff --git a/doc/user/project/pages/pages_access_control.md b/doc/user/project/pages/pages_access_control.md index fa6618a1d0c06c..b82d0855c32891 100644 --- a/doc/user/project/pages/pages_access_control.md +++ b/doc/user/project/pages/pages_access_control.md @@ -15,7 +15,7 @@ title: GitLab Pages access control {{< history >}} - Group SAML SSO support for Pages [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/326288) in GitLab 18.2 [with a flag](../../../administration/feature_flags/_index.md) named `ff_oauth_redirect_to_sso_login`. Disabled by default. -- [Enabled](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/200682) Group SAML SSO support for Pages in GitLab 18.3. +- Group SAML SSO support for OAuth applications [enabled on GitLab Self-Managed and GitLab Dedicated](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/200682) in GitLab 18.3. {{< /history >}} -- GitLab From 15aa5dd22727ee64c36d13806c8556feaa887c8a Mon Sep 17 00:00:00 2001 From: Naman Jagdish Gala Date: Wed, 13 Aug 2025 16:21:28 -0400 Subject: [PATCH 3/3] Apply suggestion --- doc/api/oauth2.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/api/oauth2.md b/doc/api/oauth2.md index 4509fda81b7790..f88525aba8647a 100644 --- a/doc/api/oauth2.md +++ b/doc/api/oauth2.md @@ -200,7 +200,7 @@ You can now make requests to the API with the access token. {{< history >}} - Group SAML SSO support for OAuth applications [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/461212) in GitLab 18.2 [with a flag](../administration/feature_flags/_index.md) named `ff_oauth_redirect_to_sso_login`. Disabled by default. -- Group SAML SSO support for OAuth applications [enabled](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/200682) in GitLab 18.3. +- Group SAML SSO support for OAuth applications [enabled on GitLab Self-Managed and GitLab Dedicated](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/200682) in GitLab 18.3. {{< /history >}} -- GitLab