Skip to content
代码片段 群组 项目
提交 4747e428 编辑于 作者: Lindsey Shelton's avatar Lindsey Shelton
浏览文件

Remove early access checkbox

Remove early access checkbox in haml
Remove experimental_settings section in haml
Update specs associated with removal
Update gitlab.pot

Changelog: removed
MR: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/166776
EE: true
上级 698c57a3
No related branches found
No related tags found
无相关合并请求
...@@ -33,7 +33,6 @@ ...@@ -33,7 +33,6 @@
= render 'groups/settings/lfs', f: f = render 'groups/settings/lfs', f: f
= render_if_exists 'groups/settings/auto_assign_duo_pro', f: f, group: @group = render_if_exists 'groups/settings/auto_assign_duo_pro', f: f, group: @group
= render_if_exists 'groups/settings/duo_features_enabled', f: f, group: @group = render_if_exists 'groups/settings/duo_features_enabled', f: f, group: @group
= render_if_exists 'groups/settings/experimental_settings', f: f, group: @group
= render_if_exists 'groups/settings/product_analytics_settings', f: f, group: @group = render_if_exists 'groups/settings/product_analytics_settings', f: f, group: @group
= render 'groups/settings/git_access_protocols', f: f, group: @group = render 'groups/settings/git_access_protocols', f: f, group: @group
= render 'groups/settings/project_creation_level', f: f, group: @group = render 'groups/settings/project_creation_level', f: f, group: @group
......
- return unless group.experiment_settings_allowed? && ::Feature.enabled?(:early_access_program_toggle, current_user)
- early_access_program_link_start = '<a href="https://about.gitlab.com/community/early-access/" target="_blank" rel="noopener noreferrer">'.html_safe
%h5
= _('GitLab Duo experiment and beta features')
.form-group.gl-mb-3
.gl-ml-6.gl-mt-2
= f.gitlab_ui_checkbox_component :early_access_program_participant,
s_('GroupSettings|Participate in the %{link_start}GitLab Early Access Program%{link_end}.').html_safe % { link_start: early_access_program_link_start, link_end: '</a>'.html_safe },
checkbox_options: { data: { testid: 'use-early-access-program-checkbox' } }
...@@ -108,41 +108,6 @@ ...@@ -108,41 +108,6 @@
end end
end end
context 'for experimental settings' do
context 'when settings are disabled' do
it 'renders nothing' do
allow(group).to receive(:experiment_settings_allowed?).and_return(false)
render
expect(rendered).to render_template('groups/settings/_experimental_settings')
expect(rendered).not_to have_content('GitLab Duo experiment and beta features')
end
end
context 'when feature flag is not available ' do
it 'renders nothing' do
stub_feature_flags(early_access_program_toggle: false)
render
expect(rendered).to render_template('groups/settings/_experimental_settings')
expect(rendered).not_to have_content('GitLab Duo experiment and beta features')
end
end
context 'when experiment settings for group is enabled and feature flag is available' do
it 'renders the experiment settings' do
allow(group).to receive(:experiment_settings_allowed?).and_return(true)
render
expect(rendered).to render_template('groups/settings/_experimental_settings')
expect(rendered).to have_content('GitLab Duo experiment and beta features')
end
end
end
context 'for extensions marketplace settings' do context 'for extensions marketplace settings' do
let_it_be(:section_title) { _('Web IDE and workspaces') } let_it_be(:section_title) { _('Web IDE and workspaces') }
let_it_be(:checkbox_label) { s_('GroupSettings|Enable extension marketplace') } let_it_be(:checkbox_label) { s_('GroupSettings|Enable extension marketplace') }
......
...@@ -26535,9 +26535,6 @@ msgstr "" ...@@ -26535,9 +26535,6 @@ msgstr ""
msgid "GroupSettings|Organizations and contacts can be created and associated with issues." msgid "GroupSettings|Organizations and contacts can be created and associated with issues."
msgstr "" msgstr ""
   
msgid "GroupSettings|Participate in the %{link_start}GitLab Early Access Program%{link_end}."
msgstr ""
msgid "GroupSettings|Please choose a group URL with no special characters or spaces." msgid "GroupSettings|Please choose a group URL with no special characters or spaces."
msgstr "" msgstr ""
   
...@@ -45,10 +45,6 @@ def self.prepended(base) ...@@ -45,10 +45,6 @@ def self.prepended(base)
element 'seat-control-user-cap-radio' element 'seat-control-user-cap-radio'
element 'user-cap-limit-field' element 'user-cap-limit-field'
end end
view 'ee/app/views/groups/settings/_experimental_settings.haml' do
element 'use-early-access-program-checkbox'
end
end end
end end
...@@ -85,13 +81,6 @@ def set_ip_address_restriction(ip_address) ...@@ -85,13 +81,6 @@ def set_ip_address_restriction(ip_address)
click_element('save-permissions-changes-button') click_element('save-permissions-changes-button')
end end
def set_experimental_features_enabled
expand_content('permissions-settings') do
check_element('use-early-access-program-checkbox', true)
click_element('save-permissions-changes-button')
end
end
def set_membership_lock_enabled def set_membership_lock_enabled
expand_content('permissions-settings') expand_content('permissions-settings')
check_element('membership-lock-checkbox', true) check_element('membership-lock-checkbox', true)
...@@ -104,13 +93,6 @@ def set_membership_lock_disabled ...@@ -104,13 +93,6 @@ def set_membership_lock_disabled
click_element('save-permissions-changes-button') click_element('save-permissions-changes-button')
end end
def set_use_experimental_features_enabled
expand_content('permissions-settings')
check_element('use-early-access-program-checkbox', true)
check_element('use-product-analytics-checkbox', true) if has_element?('use-product-analytics-checkbox')
click_element('save-permissions-changes-button')
end
def set_prevent_forking_outside_group_enabled def set_prevent_forking_outside_group_enabled
expand_content('permissions-settings') expand_content('permissions-settings')
check_element('prevent-forking-outside-group-checkbox', true) check_element('prevent-forking-outside-group-checkbox', true)
......
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册