summaryrefslogtreecommitdiff
path: root/app/models/commit.rb
diff options
context:
space:
mode:
Diffstat (limited to 'app/models/commit.rb')
-rw-r--r--app/models/commit.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/models/commit.rb b/app/models/commit.rb
index 60d7c3d..5a01667 100644
--- a/app/models/commit.rb
+++ b/app/models/commit.rb
@@ -122,10 +122,10 @@ class Commit < ActiveRecord::Base
def status
if success?
'success'
- elsif running?
- 'running'
elsif pending?
'pending'
+ elsif running?
+ 'running'
else
'failed'
end
@@ -139,7 +139,7 @@ class Commit < ActiveRecord::Base
def running?
builds_without_retry.any? do |build|
- build.running?
+ build.running? || build.pending?
end
end