Add latest changes from gitlab-org/gitlab@master

5 files changed, 12 insertions, 5 deletions

diff --git a/qa/qa/resource/merge_request.rb b/qa/qa/resource/merge_request.rb
index 24fb96a20a2..6c0f4621dd9 100644
--- a/qa/qa/resource/merge_request.rb
+++ b/qa/qa/resource/merge_request.rb
@@ -54,7 +54,7 @@ module QA
         @assignee = nil
         @milestone = nil
         @labels = []
-        @file_name = "added_file.txt"
+        @file_name = "added_file-#{SecureRandom.hex(8)}.txt"
         @file_content = "File Added"
         @target_new_branch = true
         @no_preparation = false
diff --git a/qa/qa/resource/merge_request_from_fork.rb b/qa/qa/resource/merge_request_from_fork.rb
index 6c9a096289b..9cb4e6a49ca 100644
--- a/qa/qa/resource/merge_request_from_fork.rb
+++ b/qa/qa/resource/merge_request_from_fork.rb
@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'securerandom'
+
 module QA
   module Resource
     class MergeRequestFromFork < MergeRequest
@@ -13,7 +15,7 @@ module QA
         Repository::ProjectPush.fabricate! do |resource|
           resource.project = fork.project
           resource.branch_name = fork_branch
-          resource.file_name = 'file2.txt'
+          resource.file_name = "file2-#{SecureRandom.hex(8)}.txt"
           resource.user = fork.user
         end
       end
diff --git a/qa/qa/resource/protected_branch.rb b/qa/qa/resource/protected_branch.rb
index f0cef624e0b..6aadbd55d0a 100644
--- a/qa/qa/resource/protected_branch.rb
+++ b/qa/qa/resource/protected_branch.rb
@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'securerandom'
+
 module QA
   module Resource
     class ProtectedBranch < Base
@@ -15,7 +17,7 @@ module QA
       attribute :branch do
         Repository::ProjectPush.fabricate! do |project_push|
           project_push.project = project
-          project_push.file_name = 'new_file.md'
+          project_push.file_name = "new_file-#{SecureRandom.hex(8)}.md"
           project_push.commit_message = 'Add new file'
           project_push.branch_name = branch_name
           project_push.new_branch = true
diff --git a/qa/qa/resource/repository/project_push.rb b/qa/qa/resource/repository/project_push.rb
index f79bb035c46..17596601cf9 100644
--- a/qa/qa/resource/repository/project_push.rb
+++ b/qa/qa/resource/repository/project_push.rb
@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'securerandom'
+
 module QA
   module Resource
     module Repository
@@ -15,7 +17,7 @@ module QA
         end
 
         def initialize
-          @file_name = 'file.txt'
+          @file_name = "file-#{SecureRandom.hex(8)}.txt"
           @file_content = '# This is test project'
           @commit_message = "This is a test commit"
           @branch_name = 'master'
diff --git a/qa/qa/resource/repository/push.rb b/qa/qa/resource/repository/push.rb
index 68674248be2..902ae9f3135 100644
--- a/qa/qa/resource/repository/push.rb
+++ b/qa/qa/resource/repository/push.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'pathname'
+require 'securerandom'
 
 module QA
   module Resource
@@ -13,7 +14,7 @@ module QA
         attr_writer :remote_branch, :gpg_key_id
 
         def initialize
-          @file_name = 'file.txt'
+          @file_name = "file-#{SecureRandom.hex(8)}.txt"
           @file_content = '# This is test file'
           @commit_message = "This is a test commit"
           @branch_name = 'master'