summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
-rw-r--r--app/models/project.rb5
1 files changed, 5 insertions, 0 deletions
diff --git a/app/models/project.rb b/app/models/project.rb
index 87116451caa..f14719630cf 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -821,6 +821,7 @@ class Project < ActiveRecord::Base
end
end
+<<<<<<< HEAD
def any_runners?(&block)
if runners.active.any?(&block)
return true
@@ -850,4 +851,8 @@ class Project < ActiveRecord::Base
def build_timeout_in_minutes=(value)
self.build_timeout = value.to_i * 60
end
+
+ def open_issues_count
+ issues.opened.count
+ end
end