diff options
author | Robert Speicher <rspeicher@gmail.com> | 2016-12-27 15:58:37 -0500 |
---|---|---|
committer | Robert Speicher <rspeicher@gmail.com> | 2016-12-27 15:58:37 -0500 |
commit | ffca0da08f22e6b23587ecf0645b44c3c427eddd (patch) | |
tree | f93bea85fa3dee9d81cf89b7d4a264d2b8fb177f | |
parent | e8254c3076529d48d8025900f81e1eca8ad0b3cc (diff) | |
download | gitlab-ce-ffca0da08f22e6b23587ecf0645b44c3c427eddd.tar.gz |
Revert "Merge branch 'fix-latest-pipeine-ordering-again' into 'master'"
This reverts commit a18ad6cf733ce9a466a32f32ea8e813f19caa3a5.
-rw-r--r-- | app/models/ci/pipeline.rb | 2 | ||||
-rw-r--r-- | spec/models/ci/pipeline_spec.rb | 13 |
2 files changed, 1 insertions, 14 deletions
diff --git a/app/models/ci/pipeline.rb b/app/models/ci/pipeline.rb index a7618ef7e3d..6894a5763ff 100644 --- a/app/models/ci/pipeline.rb +++ b/app/models/ci/pipeline.rb @@ -102,7 +102,7 @@ module Ci end def self.latest_successful_for(ref) - success.latest(ref).order(id: :desc).first + success.latest(ref).first end def self.truncate_sha(sha) diff --git a/spec/models/ci/pipeline_spec.rb b/spec/models/ci/pipeline_spec.rb index f1e9583a7ee..b28da6daabf 100644 --- a/spec/models/ci/pipeline_spec.rb +++ b/spec/models/ci/pipeline_spec.rb @@ -462,19 +462,6 @@ describe Ci::Pipeline, models: true do end end - describe '.latest_successful_for' do - include_context 'with some outdated pipelines' - - let!(:latest_successful_pipeline) do - create_pipeline(:success, 'ref', 'D') - end - - it 'returns the latest successful pipeline' do - expect(described_class.latest_successful_for('ref')). - to eq(latest_successful_pipeline) - end - end - describe '#status' do let!(:build) { create(:ci_build, :created, pipeline: pipeline, name: 'test') } |