From 77f8a1e392b64f51326df8aebdc77e97af07bfed Mon Sep 17 00:00:00 2001
From: Zeger-Jan van de Weg <mail@zjvandeweg.nl>
Date: Mon, 2 Nov 2015 17:27:38 +0100
Subject: Merge when build succeeds

---
 app/models/ci/commit.rb | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'app/models/ci/commit.rb')

diff --git a/app/models/ci/commit.rb b/app/models/ci/commit.rb
index 13437b2483f..ebe4bace3b5 100644
--- a/app/models/ci/commit.rb
+++ b/app/models/ci/commit.rb
@@ -164,6 +164,14 @@ module Ci
       status == 'canceled'
     end
 
+    def active?
+      running? || pending?
+    end
+
+    def complete?
+      canceled? || success? || failed?
+    end
+
     def duration
       duration_array = latest_statuses.map(&:duration).compact
       duration_array.reduce(:+).to_i
-- 
cgit v1.2.1