diff --git a/app/views/groups/settings/_permissions.html.haml b/app/views/groups/settings/_permissions.html.haml index a52592095b8e4f30c72ecab7a1c2756c77870022..8d459b7f3d3e3344656d581966b81991dbdf48bd 100644 --- a/app/views/groups/settings/_permissions.html.haml +++ b/app/views/groups/settings/_permissions.html.haml @@ -33,7 +33,6 @@ = render 'groups/settings/lfs', f: f = 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/experimental_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/project_creation_level', f: f, group: @group diff --git a/ee/app/views/groups/settings/_experimental_settings.haml b/ee/app/views/groups/settings/_experimental_settings.haml deleted file mode 100644 index 8fa57d930668f3571fc80bd99498e349e505d1a9..0000000000000000000000000000000000000000 --- a/ee/app/views/groups/settings/_experimental_settings.haml +++ /dev/null @@ -1,12 +0,0 @@ -- 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' } } diff --git a/ee/spec/views/groups/settings/_permissions.html.haml_spec.rb b/ee/spec/views/groups/settings/_permissions.html.haml_spec.rb index 4c198670936d9055942a43ca91dabffa13cb8feb..929187551e3f00499db429fb7ad7e7b09f01aa3f 100644 --- a/ee/spec/views/groups/settings/_permissions.html.haml_spec.rb +++ b/ee/spec/views/groups/settings/_permissions.html.haml_spec.rb @@ -108,41 +108,6 @@ 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 let_it_be(:section_title) { _('Web IDE and workspaces') } let_it_be(:checkbox_label) { s_('GroupSettings|Enable extension marketplace') } diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 191edc54600a2b250581881dcf9888ccdef67a85..c7b617db2ad020a0e56e18c6114587fab1d141a7 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -26535,9 +26535,6 @@ msgstr "" msgid "GroupSettings|Organizations and contacts can be created and associated with issues." 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." msgstr "" diff --git a/qa/qa/ee/page/group/settings/general.rb b/qa/qa/ee/page/group/settings/general.rb index 0551acb6caadae96d80435679b97794352b3df7e..b9ba6e6d020fe5ab27aec8575a71879a68c8e705 100644 --- a/qa/qa/ee/page/group/settings/general.rb +++ b/qa/qa/ee/page/group/settings/general.rb @@ -45,10 +45,6 @@ def self.prepended(base) element 'seat-control-user-cap-radio' element 'user-cap-limit-field' end - - view 'ee/app/views/groups/settings/_experimental_settings.haml' do - element 'use-early-access-program-checkbox' - end end end @@ -85,13 +81,6 @@ def set_ip_address_restriction(ip_address) click_element('save-permissions-changes-button') 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 expand_content('permissions-settings') check_element('membership-lock-checkbox', true) @@ -104,13 +93,6 @@ def set_membership_lock_disabled click_element('save-permissions-changes-button') 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 expand_content('permissions-settings') check_element('prevent-forking-outside-group-checkbox', true)