Add latest changes from gitlab-org/gitlab@master

3 files changed, 6 insertions, 6 deletions

diff --git a/qa/qa/runtime/env.rb b/qa/qa/runtime/env.rb
index e7c9478fa54..ccb87147a6e 100644
--- a/qa/qa/runtime/env.rb
+++ b/qa/qa/runtime/env.rb
@@ -57,7 +57,7 @@ module QA
       end
 
       def default_branch
-        ENV['QA_DEFAULT_BRANCH'] || 'master'
+        ENV['QA_DEFAULT_BRANCH'] || 'main'
       end
 
       def log_destination
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 d68c22592ab..add3cff9b3b 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
@@ -56,7 +56,7 @@ module QA
       end
 
       before(:all) do
-        Runtime::Feature.enable(:bulk_import)
+        Runtime::Feature.enable(:bulk_import) unless staging?
         Runtime::Feature.enable(:top_level_group_creation_enabled) if staging?
       end
 
@@ -110,7 +110,7 @@ module QA
       end
 
       after(:all) do
-        Runtime::Feature.disable(:bulk_import)
+        Runtime::Feature.disable(:bulk_import) unless staging?
         Runtime::Feature.disable(:top_level_group_creation_enabled) if staging?
       end
     end
diff --git a/qa/spec/specs/helpers/context_selector_spec.rb b/qa/spec/specs/helpers/context_selector_spec.rb
index 16b6c6601b1..7792d33dcf9 100644
--- a/qa/spec/specs/helpers/context_selector_spec.rb
+++ b/qa/spec/specs/helpers/context_selector_spec.rb
@@ -189,9 +189,9 @@ RSpec.describe QA::Specs::Helpers::ContextSelector do
 
       it 'runs on default branch pipelines' do
         group = describe_successfully do
-          it('runs on master pipeline given a single pipeline', only: { pipeline: :master }) {}
-          it('runs in master given an array of pipelines', only: { pipeline: [:canary, :master] }) {}
-          it('does not run in non-default pipelines', only: { pipeline: [:nightly, :not_nightly, :not_master] }) {}
+          it('runs on main pipeline given a single pipeline', only: { pipeline: :main }) {}
+          it('runs in main given an array of pipelines', only: { pipeline: [:canary, :main] }) {}
+          it('does not run in non-default pipelines', only: { pipeline: [:nightly, :not_nightly, :not_main] }) {}
         end
 
         aggregate_failures do