Permalink
Browse files

Create/update collab branch every time collab syntax is used

  • Loading branch information...
1 parent aadc111 commit 01c2eaeef0d4bed4f25f2dc35a586aae8f42d90a @winton committed Oct 2, 2012
Showing with 12 additions and 12 deletions.
  1. +1 −1 features/steps/gitcycle_steps.rb
  2. +11 −11 lib/gitcycle.rb
@@ -340,7 +340,7 @@ def type(text)
}
should['collab'] = '1' if collab
if @scenario_title.include?("(Discuss)") && @scenario_title.include?("something committed")
- should['labels'] = [ "Discuss" ]
+ should['labels'] = "Branch - master"
should['issue_url'] = $github_url
should['state'] = 'open'
end
View
@@ -135,9 +135,9 @@ def checkout(*args)
else
remote, branch = args[0].split('/')
remote, branch = nil, remote if branch.nil?
+ collab = branch && remote
unless branches(:match => branch)
- collab = branch && remote
og_remote = nil
puts "\nRetrieving repo information from gitcycle.\n".green
@@ -166,17 +166,17 @@ def checkout(*args)
puts "Could not find branch #{"'#{og_remote}/#{branch}' or " if og_remote}'#{remote}/#{branch}'.\n".red
exit
end
+ end
- if collab
- puts "Sending branch information to gitcycle.".green
- get('branch',
- 'branch[home]' => remote,
- 'branch[name]' => branch,
- 'branch[source]' => branch,
- 'branch[collab]' => 1,
- 'create' => 1
- )
- end
+ if collab
+ puts "Sending branch information to gitcycle.".green
+ get('branch',
+ 'branch[home]' => remote,
+ 'branch[name]' => branch,
+ 'branch[source]' => branch,
+ 'branch[collab]' => 1,
+ 'create' => 1
+ )
end
puts "Checking out '#{branch}'.\n".green

0 comments on commit 01c2eae

Please sign in to comment.