From a9ae162270049d3a183024e0b1f1626dbe14e847 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 31 Aug 2021 12:11:07 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- qa/qa/specs/features/api/1_manage/bulk_import_group_spec.rb | 2 -- .../specs/features/browser_ui/1_manage/group/bulk_import_group_spec.rb | 2 -- 2 files changed, 4 deletions(-) (limited to 'qa') diff --git a/qa/qa/specs/features/api/1_manage/bulk_import_group_spec.rb b/qa/qa/specs/features/api/1_manage/bulk_import_group_spec.rb index 7655cb24f0a..925d50a6639 100644 --- a/qa/qa/specs/features/api/1_manage/bulk_import_group_spec.rb +++ b/qa/qa/specs/features/api/1_manage/bulk_import_group_spec.rb @@ -54,7 +54,6 @@ module QA end before do - Runtime::Feature.enable(:bulk_import) unless staging? Runtime::Feature.enable(:top_level_group_creation_enabled) if staging? sandbox.add_member(user, Resource::Members::AccessLevel::MAINTAINER) @@ -91,7 +90,6 @@ module QA after do user.remove_via_api! ensure - Runtime::Feature.disable(:bulk_import) unless staging? Runtime::Feature.disable(:top_level_group_creation_enabled) if staging? end end diff --git a/qa/qa/specs/features/browser_ui/1_manage/group/bulk_import_group_spec.rb b/qa/qa/specs/features/browser_ui/1_manage/group/bulk_import_group_spec.rb index f9b367724a8..c3be58fda74 100644 --- a/qa/qa/specs/features/browser_ui/1_manage/group/bulk_import_group_spec.rb +++ b/qa/qa/specs/features/browser_ui/1_manage/group/bulk_import_group_spec.rb @@ -38,7 +38,6 @@ module QA end before do - Runtime::Feature.enable(:bulk_import) unless staging? Runtime::Feature.enable(:top_level_group_creation_enabled) if staging? sandbox.add_member(user, Resource::Members::AccessLevel::MAINTAINER) @@ -77,7 +76,6 @@ module QA after do user.remove_via_api! ensure - Runtime::Feature.disable(:bulk_import) unless staging? Runtime::Feature.disable(:top_level_group_creation_enabled) if staging? end end -- cgit v1.2.3