lib/gitscape/base.rb in gitscape-1.5.5 vs lib/gitscape/base.rb in gitscape-1.5.6

- old
+ new

@@ -52,10 +52,10 @@ toRet = `git branch`.scan(/\* (.*)$/).flatten[0] toRet end def current_release_branch_number - unmerged_into_live_branch_names = `git branch -a --no-merged live`.split("\n") + unmerged_into_live_branch_names = `git branch -a --no-merged origin/live`.split("\n") release_branch_regex = /release\/i(\d+)$/ candidates = unmerged_into_live_branch_names.select{ |b| release_branch_regex.match b}.map{|b| b.scan(release_branch_regex).flatten[0].to_i}.sort candidates.last end