diff options
| author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2016-12-17 13:34:35 +0100 |
|---|---|---|
| committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2016-12-17 13:34:35 +0100 |
| commit | dc68a91c444d3da85bbcb87e4ef4e841be9f3887 (patch) | |
| tree | 936ff711232e17db2fd03653a1b4310a7a388671 | |
| parent | 1476bb2c54d8195ea673777c2d5c873c2a3becf7 (diff) | |
| download | gitlab-ce-dc68a91c444d3da85bbcb87e4ef4e841be9f3887.tar.gz | |
Fix CI/CD statuses actions' CSS on pipeline graphs
| -rw-r--r-- | app/views/ci/status/_graph_badge.html.haml | 2 | ||||
| -rw-r--r-- | spec/features/projects/pipelines/pipeline_spec.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/ci/status/_graph_badge.html.haml b/app/views/ci/status/_graph_badge.html.haml index c7d04ab61e9..9f3a9c0c6b2 100644 --- a/app/views/ci/status/_graph_badge.html.haml +++ b/app/views/ci/status/_graph_badge.html.haml @@ -2,7 +2,7 @@ - subject = local_assigns.fetch(:subject) - 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? = link_to status.details_path, data: { toggle: 'tooltip', title: "#{subject.name} - #{status.label}" } do diff --git a/spec/features/projects/pipelines/pipeline_spec.rb b/spec/features/projects/pipelines/pipeline_spec.rb index 0a77eaa123c..57f1e75ea2c 100644 --- a/spec/features/projects/pipelines/pipeline_spec.rb +++ b/spec/features/projects/pipelines/pipeline_spec.rb @@ -99,7 +99,7 @@ describe "Pipelines", feature: true, js: true do context 'when pipeline has manual builds' 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 - expect(page).to have_selector('.ci-status-icon-skipped') + expect(page).to have_selector('.ci-status-icon-manual') expect(page).to have_content('manual') end |