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
dc68a91c
Commit
dc68a91c
authored
Dec 17, 2016
by
Grzegorz Bizon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix CI/CD statuses actions' CSS on pipeline graphs
parent
1476bb2c
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
app/views/ci/status/_graph_badge.html.haml
app/views/ci/status/_graph_badge.html.haml
+1
-1
spec/features/projects/pipelines/pipeline_spec.rb
spec/features/projects/pipelines/pipeline_spec.rb
+1
-1
No files found.
app/views/ci/status/_graph_badge.html.haml
View file @
dc68a91c
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
-
subject
=
local_assigns
.
fetch
(
:subject
)
-
subject
=
local_assigns
.
fetch
(
:subject
)
-
status
=
subject
.
detailed_status
(
current_user
)
-
status
=
subject
.
detailed_status
(
current_user
)
-
klass
=
"ci-status-icon ci-status-icon-
#{
status
}
"
-
klass
=
"ci-status-icon ci-status-icon-
#{
status
.
group
}
"
-
if
status
.
has_details?
-
if
status
.
has_details?
=
link_to
status
.
details_path
,
data:
{
toggle:
'tooltip'
,
title:
"
#{
subject
.
name
}
-
#{
status
.
label
}
"
}
do
=
link_to
status
.
details_path
,
data:
{
toggle:
'tooltip'
,
title:
"
#{
subject
.
name
}
-
#{
status
.
label
}
"
}
do
...
...
spec/features/projects/pipelines/pipeline_spec.rb
View file @
dc68a91c
...
@@ -99,7 +99,7 @@ describe "Pipelines", feature: true, js: true do
...
@@ -99,7 +99,7 @@ describe "Pipelines", feature: true, js: true do
context
'when pipeline has manual builds'
do
context
'when pipeline has manual builds'
do
it
'shows the skipped icon and a play action for the manual build'
do
it
'shows the skipped icon and a play action for the manual build'
do
page
.
within
(
'a[data-title="manual build - manual play action"]'
)
do
page
.
within
(
'a[data-title="manual build - manual play action"]'
)
do
expect
(
page
).
to
have_selector
(
'.ci-status-icon-
skipped
'
)
expect
(
page
).
to
have_selector
(
'.ci-status-icon-
manual
'
)
expect
(
page
).
to
have_content
(
'manual'
)
expect
(
page
).
to
have_content
(
'manual'
)
end
end
...
...
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