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

Merge branch 'add-beta-tag-to-block-seat-overages' into 'master'

Add Beta Badge to Seat Controls Restricted Access Setting

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/164260



Merged-by: default avatarKushal Pandya <kushal@gitlab.com>
Approved-by: default avatarAngelo Gulina <agulina@gitlab.com>
Approved-by: default avatarKushal Pandya <kushal@gitlab.com>
Reviewed-by: default avatarAngelo Gulina <agulina@gitlab.com>
Co-authored-by: default avatarJason Goodman <jgoodman@gitlab.com>
No related branches found
No related tags found
无相关合并请求
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
%fieldset %fieldset
.form-group.gl-mb-0 .form-group.gl-mb-0
= f.label :pre_receive_secret_detection_enabled, s_('AdminSettings|Secret Push Protection'), class: 'label-bold' = f.label :pre_receive_secret_detection_enabled, s_('AdminSettings|Secret Push Protection'), class: 'label-bold'
= render 'beta_badge', style: 'gl-ml-1 gl-mt-1' = render 'shared/beta_badge', style: 'gl-ml-1 gl-mt-1'
%span.form-text.gl-mt-0.gl-mb-3#pre_receive_secret_detection-help %span.form-text.gl-mt-0.gl-mb-3#pre_receive_secret_detection-help
= _('Prevent secrets such as keys and API tokens from being committed to any repository in this GitLab instance.') = _('Prevent secrets such as keys and API tokens from being committed to any repository in this GitLab instance.')
= f.gitlab_ui_checkbox_component :pre_receive_secret_detection_enabled, _('Allow secret push protection'), help_text: _("Allow projects to enable secret push protection. This does not enable secret push protection. When you enable this feature, you accept the %{link_start}GitLab Testing Agreement%{link_end}.").html_safe % { link_start: terms_link_start, link_end: '</a>'.html_safe } = f.gitlab_ui_checkbox_component :pre_receive_secret_detection_enabled, _('Allow secret push protection'), help_text: _("Allow projects to enable secret push protection. This does not enable secret push protection. When you enable this feature, you accept the %{link_start}GitLab Testing Agreement%{link_end}.").html_safe % { link_start: terms_link_start, link_end: '</a>'.html_safe }
......
= _("Restricted access")
= render('shared/beta_badge', style: 'gl-ml-1 gl-mt-1')
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
= _("Seat controls") = _("Seat controls")
- if ::Feature.enabled?(:block_seat_overages, group) - if ::Feature.enabled?(:block_seat_overages, group)
%div %div
= f.gitlab_ui_radio_component :seat_control, :block_overages, _("Restricted access"), = f.gitlab_ui_radio_component :seat_control, :block_overages, render('groups/restricted_access_label'),
help_text: _("Invitations above seat count are blocked"), help_text: _("Invitations above seat count are blocked"),
radio_options: { disabled: group.shared_externally? } radio_options: { disabled: group.shared_externally? }
%div %div
......
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册