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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
091f6387
Commit
091f6387
authored
Nov 07, 2017
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix commit pipeline showing wrong status
parent
8138d58d
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
1 deletion
+13
-1
app/views/projects/commit/_commit_box.html.haml
app/views/projects/commit/_commit_box.html.haml
+1
-1
changelogs/unreleased/39878-commit-pipeline-reads-wrong-key.yml
...logs/unreleased/39878-commit-pipeline-reads-wrong-key.yml
+5
-0
spec/features/projects/commit/mini_pipeline_graph_spec.rb
spec/features/projects/commit/mini_pipeline_graph_spec.rb
+7
-0
No files found.
app/views/projects/commit/_commit_box.html.haml
View file @
091f6387
...
@@ -67,7 +67,7 @@
...
@@ -67,7 +67,7 @@
-
if
@commit
.
last_pipeline
-
if
@commit
.
last_pipeline
-
last_pipeline
=
@commit
.
last_pipeline
-
last_pipeline
=
@commit
.
last_pipeline
.well-segment.pipeline-info
.well-segment.pipeline-info
.status-icon-container
{
class:
"ci-status-icon-#{
@commit
.status}"
}
.status-icon-container
{
class:
"ci-status-icon-#{
last_pipeline
.status}"
}
=
link_to
project_pipeline_path
(
@project
,
last_pipeline
.
id
)
do
=
link_to
project_pipeline_path
(
@project
,
last_pipeline
.
id
)
do
=
ci_icon_for_status
(
last_pipeline
.
status
)
=
ci_icon_for_status
(
last_pipeline
.
status
)
#{
_
(
'Pipeline'
)
}
#{
_
(
'Pipeline'
)
}
...
...
changelogs/unreleased/39878-commit-pipeline-reads-wrong-key.yml
0 → 100644
View file @
091f6387
---
title
:
Fix commit pipeline showing wrong status
merge_request
:
author
:
type
:
fixed
spec/features/projects/commit/mini_pipeline_graph_spec.rb
View file @
091f6387
...
@@ -12,6 +12,13 @@ feature 'Mini Pipeline Graph in Commit View', :js do
...
@@ -12,6 +12,13 @@ feature 'Mini Pipeline Graph in Commit View', :js do
end
end
let
(
:build
)
{
create
(
:ci_build
,
pipeline:
pipeline
)
}
let
(
:build
)
{
create
(
:ci_build
,
pipeline:
pipeline
)
}
it
'display icon with status'
do
build
.
run
visit
project_commit_path
(
project
,
project
.
commit
.
id
)
expect
(
page
).
to
have_selector
(
'.ci-status-icon-running'
)
end
it
'displays a mini pipeline graph'
do
it
'displays a mini pipeline graph'
do
build
.
run
build
.
run
visit
project_commit_path
(
project
,
project
.
commit
.
id
)
visit
project_commit_path
(
project
,
project
.
commit
.
id
)
...
...
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