diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2015-10-12 21:35:52 +0200 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2015-10-12 22:32:29 +0200 |
| commit | daca1c6511c3a09d5f0c33a8c4d29487e668afc2 (patch) | |
| tree | 09ed2762efbf1bf1268673d474649442285b91e2 /app/models/ci/commit.rb | |
| parent | c61dc1315077ad4e175a3c76991872c0e7b1d2ab (diff) | |
| download | gitlab-ce-daca1c6511c3a09d5f0c33a8c4d29487e668afc2.tar.gz | |
Fix broken tests
Diffstat (limited to 'app/models/ci/commit.rb')
| -rw-r--r-- | app/models/ci/commit.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/ci/commit.rb b/app/models/ci/commit.rb index 296890c5e7c..f6fc4645947 100644 --- a/app/models/ci/commit.rb +++ b/app/models/ci/commit.rb @@ -82,7 +82,7 @@ module Ci end def stage - running_or_pending = statuses.latest.running_or_pending + running_or_pending = statuses.latest.running_or_pending.ordered running_or_pending.first.try(:stage) end @@ -189,7 +189,7 @@ module Ci end def matrix_for_ref?(ref) - latest_builds_for_ref(ref).size > 1 + builds_without_retry_for_ref(ref).size > 1 end def config_processor |