lib/gitscape/base.rb in gitscape-1.6.3 vs lib/gitscape/base.rb in gitscape-1.6.4

@@ -60,10 +60,15 @@
     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
 
   def current_release_branch_name
-    "release/i#{current_release_branch_number}"
+    release_number = current_release_branch_number
+    if !release_number.nil?
+      "release/i#{current_release_branch_number}"
+    else
+      nil
+    end
   end
 
   def git_has_conflicts puts_conflicts=true
     conflicts_status = `git status --porcelain`
     has_conflicts = conflicts_status.scan(/[AUD]{2}/).count > 0