Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
090ede2d
Commit
090ede2d
authored
Dec 26, 2016
by
Kamil Trzciński
Committed by
Robert Speicher
Dec 27, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Merge branch 'fix-latest-pipeine-ordering-again' into 'master'
Order only for latest_successful_for See merge request !8301
parent
3483ae91
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
20 additions
and
6 deletions
+20
-6
app/models/ci/pipeline.rb
app/models/ci/pipeline.rb
+3
-6
changelogs/unreleased/fix-latest-pipeine-ordering.yml
changelogs/unreleased/fix-latest-pipeine-ordering.yml
+4
-0
spec/models/ci/pipeline_spec.rb
spec/models/ci/pipeline_spec.rb
+13
-0
No files found.
app/models/ci/pipeline.rb
View file @
090ede2d
...
@@ -93,11 +93,8 @@ module Ci
...
@@ -93,11 +93,8 @@ module Ci
.
select
(
"max(
#{
quoted_table_name
}
.id)"
)
.
select
(
"max(
#{
quoted_table_name
}
.id)"
)
.
group
(
:ref
,
:sha
)
.
group
(
:ref
,
:sha
)
if
ref
relation
=
ref
?
where
(
ref:
ref
)
:
self
where
(
id:
max_id
,
ref:
ref
)
relation
.
where
(
id:
max_id
)
else
where
(
id:
max_id
)
end
end
end
def
self
.
latest_status
(
ref
=
nil
)
def
self
.
latest_status
(
ref
=
nil
)
...
@@ -105,7 +102,7 @@ module Ci
...
@@ -105,7 +102,7 @@ module Ci
end
end
def
self
.
latest_successful_for
(
ref
)
def
self
.
latest_successful_for
(
ref
)
success
.
latest
(
ref
).
first
success
.
latest
(
ref
).
order
(
id: :desc
).
first
end
end
def
self
.
truncate_sha
(
sha
)
def
self
.
truncate_sha
(
sha
)
...
...
changelogs/unreleased/fix-latest-pipeine-ordering.yml
0 → 100644
View file @
090ede2d
---
title
:
Fix finding the latest pipeline
merge_request
:
8301
author
:
spec/models/ci/pipeline_spec.rb
View file @
090ede2d
...
@@ -464,6 +464,19 @@ describe Ci::Pipeline, models: true do
...
@@ -464,6 +464,19 @@ describe Ci::Pipeline, models: true do
end
end
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
describe
'#status'
do
let!
(
:build
)
{
create
(
:ci_build
,
:created
,
pipeline:
pipeline
,
name:
'test'
)
}
let!
(
:build
)
{
create
(
:ci_build
,
:created
,
pipeline:
pipeline
,
name:
'test'
)
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment