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
b8003a78
Commit
b8003a78
authored
Aug 14, 2019
by
Kamil Trzciński
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix status bugs
parent
3011d182
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
app/models/ci/pipeline.rb
app/models/ci/pipeline.rb
+1
-0
lib/gitlab/ci/status/composite_status.rb
lib/gitlab/ci/status/composite_status.rb
+4
-5
No files found.
app/models/ci/pipeline.rb
View file @
b8003a78
...
...
@@ -393,6 +393,7 @@ module Ci
Gitlab
::
Ci
::
Status
::
GroupedStatuses
.
new
(
statuses
.
latest
,
:stage
,
:stage_idx
)
.
group
(
:stage
,
:stage_idx
)
.
sort_by
{
|
stage
|
stage
[
:stage_idx
]
}
.
map
do
|
stage
|
Ci
::
LegacyStage
.
new
(
self
,
name:
stage
[
:stage
],
...
...
lib/gitlab/ci/status/composite_status.rb
View file @
b8003a78
...
...
@@ -35,8 +35,8 @@ module Gitlab
when
include
?(
:preparing
)
:preparing
when
include
?(
:created
)
:
created
when
include
?
:
running
else
:failed
end
end
...
...
@@ -48,12 +48,11 @@ module Gitlab
private
def
include?
(
*
names
)
names
.
a
ll
?
{
|
name
|
@status_set
.
include?
(
name
)
}
names
.
a
ny
?
{
|
name
|
@status_set
.
include?
(
name
)
}
end
def
only?
(
*
names
)
@status_set
.
size
==
names
.
size
&&
names
.
all?
{
|
name
|
@status_set
.
include?
(
name
)
}
matching
=
names
.
count
{
|
name
|
@status_set
.
include?
(
name
)
}
==
@status_set
.
size
end
def
build_status_set
(
all_statuses
)
...
...
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