diff --git a/config/feature_flags/gitlab_com_derisk/pat_expiry_inherited_members_notification.yml b/config/feature_flags/beta/pat_expiry_inherited_members_notification.yml similarity index 87% rename from config/feature_flags/gitlab_com_derisk/pat_expiry_inherited_members_notification.yml rename to config/feature_flags/beta/pat_expiry_inherited_members_notification.yml index 9aae1bfc204f8e75e0116ff5f24f4aac6dca03fa..f91986c707805ed4eb757c236668a62408d432b1 100644 --- a/config/feature_flags/gitlab_com_derisk/pat_expiry_inherited_members_notification.yml +++ b/config/feature_flags/beta/pat_expiry_inherited_members_notification.yml @@ -5,5 +5,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/168245 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/497743 milestone: '17.6' group: group::authentication -type: gitlab_com_derisk -default_enabled: false +type: beta +default_enabled: true diff --git a/doc/administration/settings/email.md b/doc/administration/settings/email.md index 439d167f2dd9d7af2e0008496d21cbe700a93258..c22e804c9b942ef42268bcf81f54da60b4e960df 100644 --- a/doc/administration/settings/email.md +++ b/doc/administration/settings/email.md @@ -159,6 +159,7 @@ To add additional text to deactivation emails: {{< history >}} - Notifications to inherited group members [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/463016) in GitLab 17.7 [with a flag](../feature_flags.md) named `pat_expiry_inherited_members_notification`. Disabled by default. +- Feature flag `pat_expiry_inherited_members_notification` [enabled by default in GitLab 17.10](https://gitlab.com/gitlab-org/gitlab/-/issues/393772). {{< /history >}} diff --git a/doc/user/group/manage.md b/doc/user/group/manage.md index ff8270e2965dfd389a278770d34ae5f0791df96d..afeae01986fb12d41c9dcdcecb8215c9df324b8d 100644 --- a/doc/user/group/manage.md +++ b/doc/user/group/manage.md @@ -184,7 +184,8 @@ To disable diff previews for all projects in a group: {{< history >}} -- Notifications to inherited group members [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/463016) in GitLab 17.7 [with a flag](../../administration/feature_flags.md) named `extended_expiry_webhook_execution_setting`. Disabled by default. +- Notifications to inherited group members [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/463016) in GitLab 17.7 [with a flag](../../administration/feature_flags.md) named `pat_expiry_inherited_members_notification`. Disabled by default. +- Feature flag `pat_expiry_inherited_members_notification` [enabled by default in GitLab 17.10](https://gitlab.com/gitlab-org/gitlab/-/issues/393772). {{< /history >}} diff --git a/doc/user/group/settings/group_access_tokens.md b/doc/user/group/settings/group_access_tokens.md index cbef0c1f21ea60ce739371e72dc532facf64f946..6f6ba8e2d213dd8e373d2ab4055f41687807d398 100644 --- a/doc/user/group/settings/group_access_tokens.md +++ b/doc/user/group/settings/group_access_tokens.md @@ -242,6 +242,7 @@ automatically applied: - 60 and 30 day expiry notifications [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/464040) in GitLab 17.6 [with a flag](../../../administration/feature_flags.md) named `expiring_pats_30d_60d_notifications`. Disabled by default. - 60 and 30 day notifications [generally available](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/173792) in GitLab 17.7. Feature flag `expiring_pats_30d_60d_notifications` removed. - Notifications to inherited group members [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/463016) in GitLab 17.7 [with a flag](../../../administration/feature_flags.md) named `pat_expiry_inherited_members_notification`. Disabled by default. +- Feature flag `pat_expiry_inherited_members_notification` [enabled by default in GitLab 17.10](https://gitlab.com/gitlab-org/gitlab/-/issues/393772). {{< /history >}} diff --git a/doc/user/project/settings/project_access_tokens.md b/doc/user/project/settings/project_access_tokens.md index 7350fa5b9dec2b43d23ca31e8d602676f6dd7f27..dcaf6ca72ec6ea8be7a1f4ae21361d4bf864a171 100644 --- a/doc/user/project/settings/project_access_tokens.md +++ b/doc/user/project/settings/project_access_tokens.md @@ -200,6 +200,7 @@ automatically applied: - 60 and 30 day expiry notifications [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/464040) in GitLab 17.6 [with a flag](../../../administration/feature_flags.md) named `expiring_pats_30d_60d_notifications`. Disabled by default. - 60 and 30 day notifications [generally available](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/173792) in GitLab 17.7. Feature flag `expiring_pats_30d_60d_notifications` removed. - Notifications to inherited group members [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/463016) in GitLab 17.7 [with a flag](../../../administration/feature_flags.md) named `pat_expiry_inherited_members_notification`. Disabled by default. +- Feature flag `pat_expiry_inherited_members_notification` [enabled by default in GitLab 17.10](https://gitlab.com/gitlab-org/gitlab/-/issues/393772). {{< /history >}}