gitscape 1.5.5 → 1.5.6
Sign up to get free protection for your applications and to get access to all the features.
- data/lib/gitscape/base.rb +1 -1
- data/lib/gitscape/version.rb +1 -1
- metadata +3 -3
data/lib/gitscape/base.rb
CHANGED
|
@@ -54,7 +54,7 @@ class Gitscape::Base
|
|
|
54
54
|
end
|
|
55
55
|
|
|
56
56
|
def current_release_branch_number
|
|
57
|
-
unmerged_into_live_branch_names = `git branch -a --no-merged live`.split("\n")
|
|
57
|
+
unmerged_into_live_branch_names = `git branch -a --no-merged origin/live`.split("\n")
|
|
58
58
|
release_branch_regex = /release\/i(\d+)$/
|
|
59
59
|
|
|
60
60
|
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
|
data/lib/gitscape/version.rb
CHANGED
metadata
CHANGED
|
@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
|
|
|
5
5
|
segments:
|
|
6
6
|
- 1
|
|
7
7
|
- 5
|
|
8
|
-
-
|
|
9
|
-
version: 1.5.
|
|
8
|
+
- 6
|
|
9
|
+
version: 1.5.6
|
|
10
10
|
platform: ruby
|
|
11
11
|
authors:
|
|
12
12
|
- Jon Botelho
|
|
@@ -15,7 +15,7 @@ autorequire:
|
|
|
15
15
|
bindir: bin
|
|
16
16
|
cert_chain: []
|
|
17
17
|
|
|
18
|
-
date: 2013-04-
|
|
18
|
+
date: 2013-04-16 00:00:00 -04:00
|
|
19
19
|
default_executable:
|
|
20
20
|
dependencies:
|
|
21
21
|
- !ruby/object:Gem::Dependency
|