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

1 files changed, 5 insertions, 5 deletions

diff --git a/app/services/design_management/copy_design_collection/copy_service.rb b/app/services/design_management/copy_design_collection/copy_service.rb
index 496103f9e58..b40f6a81174 100644
--- a/app/services/design_management/copy_design_collection/copy_service.rb
+++ b/app/services/design_management/copy_design_collection/copy_service.rb
@@ -86,7 +86,7 @@ module DesignManagement
       def with_temporary_branch(&block)
         target_repository.create_if_not_exists
 
-        create_master_branch! if target_repository.empty?
+        create_default_branch! if target_repository.empty?
         create_temporary_branch!
 
         yield
@@ -95,9 +95,9 @@ module DesignManagement
       end
 
       # A project that does not have any designs will have a blank design
-      # repository. To create a temporary branch from `master` we need
-      # create `master` first by adding a file to it.
-      def create_master_branch!
+      # repository. To create a temporary branch from default branch we need to
+      # create default branch first by adding a file to it.
+      def create_default_branch!
         target_repository.create_file(
           git_user,
           ".CopyDesignCollectionService_#{Time.now.to_i}",
@@ -121,7 +121,7 @@ module DesignManagement
         target_repository.rm_branch(git_user, temporary_branch)
       end
 
-      # Merge the temporary branch containing the commits to `master`
+      # Merge the temporary branch containing the commits to default branch
       # and update the state of the target_design_collection.
       def finalize!
         source_sha = shas.last