diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-18 06:08:03 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-18 06:08:03 +0000 |
| commit | dad534d98a3f86bfa079b7ebd980448641cc9c7c (patch) | |
| tree | 7dacc64e320c4503d04310633d3200cb97828b4b /qa/qa/resource/merge_request_from_fork.rb | |
| parent | 2a65a97e12a0754b9f0d91ee996a6e61e00c80c8 (diff) | |
| download | gitlab-ce-dad534d98a3f86bfa079b7ebd980448641cc9c7c.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'qa/qa/resource/merge_request_from_fork.rb')
| -rw-r--r-- | qa/qa/resource/merge_request_from_fork.rb | 4 |
1 files changed, 3 insertions, 1 deletions
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 |