Skip to content
代码片段 群组 项目
未验证 提交 cbb6bcb6 编辑于 作者: Suraj Tripathi's avatar Suraj Tripathi 提交者: GitLab
浏览文件

Changed feature flag type from wip to beta

Also changed the default value of the feature flag

EE: true
Changelog: added
上级 d9df35d3
No related branches found
No related tags found
无相关合并请求
......@@ -258,13 +258,13 @@ See the [documentation on setting up an LDAP user filter](../auth/ldap/index.md#
DETAILS:
**Tier:** Ultimate
**Offering:** Self-managed, GitLab Dedicated
**Status:** Beta
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/433166) in GitLab 16.9 [with a flag](../feature_flags.md) named `member_promotion_management`.
> - Feature flag `member_promotion_management` [changed](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/167757/) from `wip` to `beta` and enabled by default in GitLab 17.5.
FLAG:
The availability of this feature is controlled by a feature flag.
For more information, see the history.
This feature is available for testing, but not ready for production use.
In the **Ultimate** tier, [non billable roles](../../subscriptions/gitlab_com/index.md#billable-users), can be promoted to a billable role in any Project or Group, resulting in the increase of billable seats, without admins having any control on this promotion.
To prevent existing users of the subscription from being promoted to a billable role, you can enable role promotion approval.
......
......@@ -74,12 +74,10 @@ When there was any error sending the email:
```
NOTE:
When the setting **Manage non-billable promotions** is enabled, new invited members with billable roles must be approved by an administrator.
When the setting **[Manage non-billable promotions](../administration/settings/sign_up_restrictions.md#enable-role-promotion-approval)** is enabled, new invited members with billable roles must be approved by an administrator.
To enable **Manage non-billable promotions**:
1. Enable the `enable_member_promotion_management` application setting.
1. Enable the `member_promotion_management` feature flag.
To enable **Manage non-billable promotions**,
you must first enable the `enable_member_promotion_management` application setting.
Example response:
......
......@@ -627,12 +627,10 @@ Example response:
```
NOTE:
When the setting **Manage non-billable promotions** is enabled, new invited members with billable roles must be approved by an administrator.
When the setting **[Manage non-billable promotions](../administration/settings/sign_up_restrictions.md#enable-role-promotion-approval)** is enabled, new invited members with billable roles must be approved by an administrator.
To enable **Manage Non-Billable Promotions**:
1. Enable the `enable_member_promotion_management` application setting.
1. Enable the `member_promotion_management` feature flag.
To enable **Manage Non-Billable Promotions**,
you must first enable the `enable_member_promotion_management` application setting.
Example of queueing a single user:
......@@ -719,12 +717,10 @@ Example response:
```
NOTE:
When the setting **Manage non-billable promotions** is enabled, new invited users with billable roles must be approved by an administrator.
To enable **Manage non-billable promotions**:
When the setting **[Manage non-billable promotions](../administration/settings/sign_up_restrictions.md#enable-role-promotion-approval)** is enabled, new invited users with billable roles must be approved by an administrator.
1. Enable the `enable_member_promotion_management` application setting.
1. Enable the `member_promotion_management` feature flag.
To enable **Manage non-billable promotions**,
you must first enable the `enable_member_promotion_management` application setting.
Example response:
......
......@@ -5,5 +5,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/141965
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/439113
milestone: '16.9'
group: group::utilization
type: wip
default_enabled: false
type: beta
default_enabled: true
......@@ -70,7 +70,7 @@ def configure!(store)
to: ::Members::MembershipModifiedByAdminEvent,
if: ->(_) {
::Gitlab::CurrentSettings.enable_member_promotion_management? &&
::Feature.enabled?(:member_promotion_management, :instance, type: :wip)
::Feature.enabled?(:member_promotion_management, :instance, type: :beta)
}
register_threat_insights_subscribers(store)
......
......@@ -52,7 +52,7 @@ def saas_billable_role_change?(target_namespace:, role:, member_role_id: nil)
private
def ensure_feature_enabled!
return if ::Feature.enabled?(:member_promotion_management, type: :wip)
return if ::Feature.enabled?(:member_promotion_management, type: :beta)
raise "Attempted to use a WIP feature that is not enabled!"
end
......
......@@ -30,7 +30,7 @@ def promotion_management_required_for_role?(new_access_level:, member_role_id: n
private
def promotion_management_feature_enabled?
::Feature.enabled?(:member_promotion_management, type: :wip)
::Feature.enabled?(:member_promotion_management, type: :beta)
end
def promotion_management_active?
......
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册