Commit 4315c370 authored by Ramya Authappan's avatar Ramya Authappan

Merge branch 'ml-include-readme-to-avoid-branch-protection-delete-race-condition' into 'master'

Create project with readme to avoid race condition

See merge request gitlab-org/gitlab!59346
parents 2e1522bc 42cc15c9
...@@ -9,6 +9,7 @@ module QA ...@@ -9,6 +9,7 @@ module QA
let(:project) do let(:project) do
Resource::Project.fabricate_via_api! do |project| Resource::Project.fabricate_via_api! do |project|
project.name = 'file_locking' project.name = 'file_locking'
project.initialize_with_readme = true
end end
end end
...@@ -19,6 +20,7 @@ module QA ...@@ -19,6 +20,7 @@ module QA
push.project = project push.project = project
push.file_name = 'file' push.file_name = 'file'
push.file_content = SecureRandom.hex(100000) push.file_content = SecureRandom.hex(100000)
push.new_branch = false
end end
add_to_project user: user_one add_to_project user: user_one
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment