diff options
author | Lin Jen-Shin <godfat@godfat.org> | 2018-04-25 00:17:47 +0800 |
---|---|---|
committer | Lin Jen-Shin <godfat@godfat.org> | 2018-04-25 00:17:47 +0800 |
commit | 185d278bbf298e4d4ff98e418c3a7577e401359a (patch) | |
tree | 2c8a85e7e81530853038cfa538495da0f6c8e79c /qa | |
parent | 0a8430375f2e1e88319da6af8d0a50b4ea113939 (diff) | |
download | gitlab-ce-185d278bbf298e4d4ff98e418c3a7577e401359a.tar.gz |
Use remote_branch instead
Diffstat (limited to 'qa')
-rw-r--r-- | qa/qa/factory/resource/merge_request.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/qa/qa/factory/resource/merge_request.rb b/qa/qa/factory/resource/merge_request.rb index 539fe6b8a70..7588ac5735d 100644 --- a/qa/qa/factory/resource/merge_request.rb +++ b/qa/qa/factory/resource/merge_request.rb @@ -24,12 +24,14 @@ module QA dependency Factory::Repository::Push, as: :target do |push, factory| factory.project.visit! push.project = factory.project - push.branch_name = "master:#{factory.target_branch}" + push.branch_name = 'master' + push.remote_branch = factory.target_branch end dependency Factory::Repository::Push, as: :source do |push, factory| push.project = factory.project - push.branch_name = "#{factory.target_branch}:#{factory.source_branch}" + push.branch_name = factory.target_branch + push.remote_branch = factory.source_branch push.file_name = "added_file.txt" push.file_content = "File Added" end |