summaryrefslogtreecommitdiff
path: root/qa/qa/factory/resource/branch.rb
diff options
context:
space:
mode:
authorLin Jen-Shin <godfat@godfat.org>2018-04-24 21:50:57 +0800
committerLin Jen-Shin <godfat@godfat.org>2018-04-24 21:50:57 +0800
commita10d8adf315b4945c7e3149ce81b0ea7c35ba376 (patch)
tree8b712d55c49bf400c89b7aead93f34f3f1823bdb /qa/qa/factory/resource/branch.rb
parent1421469e221a14b9250d162f42e3b418528a501d (diff)
downloadgitlab-ce-a10d8adf315b4945c7e3149ce81b0ea7c35ba376.tar.gz
Rename location to uri; Handle uri for HTTP; Fix pushing remote
Diffstat (limited to 'qa/qa/factory/resource/branch.rb')
-rw-r--r--qa/qa/factory/resource/branch.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/qa/qa/factory/resource/branch.rb b/qa/qa/factory/resource/branch.rb
index d0ef142e90d..d6bfdfa2356 100644
--- a/qa/qa/factory/resource/branch.rb
+++ b/qa/qa/factory/resource/branch.rb
@@ -39,7 +39,9 @@ module QA
resource.project = project
resource.file_name = 'README.md'
resource.commit_message = 'Add readme'
- resource.branch_name = "master:#{@branch_name}"
+ resource.branch_name = 'master'
+ resource.new_branch = false
+ resource.remote_branch = @branch_name
end
Page::Project::Show.act { wait_for_push }