Add latest changes from gitlab-org/gitlab@14-0-stable-eev14.0.0-rc42

1 files changed, 8 insertions, 0 deletions

diff --git a/spec/services/design_management/copy_design_collection/copy_service_spec.rb b/spec/services/design_management/copy_design_collection/copy_service_spec.rb
index 03242487b53..186d2481c19 100644
--- a/spec/services/design_management/copy_design_collection/copy_service_spec.rb
+++ b/spec/services/design_management/copy_design_collection/copy_service_spec.rb
@@ -195,6 +195,14 @@ RSpec.describe DesignManagement::CopyDesignCollection::CopyService, :clean_gitla
             expect { subject }.to change { target_repository.branch_names }.from([]).to(['master'])
           end
 
+          it 'does not create default branch when one exists' do
+            target_repository.create_if_not_exists
+            target_repository.create_file(user, '.meta', '.gitlab', branch_name: 'new-branch', message: 'message')
+
+            expect { subject }.not_to change { target_repository.branch_names }
+            expect(target_repository.branch_names).to eq(['new-branch'])
+          end
+
           it 'leaves the design collection in the correct copy state' do
             subject