summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app/views/admin/runners/show.html.haml2
-rw-r--r--app/views/ci/status/_icon_with_description.html.haml (renamed from app/views/ci/status/_icon_with_label.html.haml)1
-rw-r--r--app/views/projects/builds/_header.html.haml2
-rw-r--r--app/views/projects/ci/builds/_build.html.haml2
-rw-r--r--app/views/projects/ci/pipelines/_pipeline.html.haml2
-rw-r--r--app/views/projects/generic_commit_statuses/_generic_commit_status.html.haml2
-rw-r--r--app/views/projects/pipelines/_info.html.haml2
-rw-r--r--app/views/projects/stage/_graph.html.haml4
8 files changed, 9 insertions, 8 deletions
diff --git a/app/views/admin/runners/show.html.haml b/app/views/admin/runners/show.html.haml
index fa8be25ffa8..badeb11b208 100644
--- a/app/views/admin/runners/show.html.haml
+++ b/app/views/admin/runners/show.html.haml
@@ -91,7 +91,7 @@
%strong ##{build.id}
%td.status
- = render "ci/status/icon_with_label", subject: build
+ = render "ci/status/icon_with_description", subject: build
%td.status
- if project
diff --git a/app/views/ci/status/_icon_with_label.html.haml b/app/views/ci/status/_icon_with_description.html.haml
index d3fe332cc78..34c923440d0 100644
--- a/app/views/ci/status/_icon_with_label.html.haml
+++ b/app/views/ci/status/_icon_with_description.html.haml
@@ -1,6 +1,7 @@
- detailed_status = subject.detailed_status(current_user)
- details_path = detailed_status.details_path if detailed_status.has_details?
- klass = "ci-status ci-#{detailed_status}"
+
- if details_path
= link_to details_path, class: klass do
= custom_icon(detailed_status.icon)
diff --git a/app/views/projects/builds/_header.html.haml b/app/views/projects/builds/_header.html.haml
index 5e4e30f08d5..85d1793ecb9 100644
--- a/app/views/projects/builds/_header.html.haml
+++ b/app/views/projects/builds/_header.html.haml
@@ -1,6 +1,6 @@
.content-block.build-header
.header-content
- = render "ci/status/icon_with_label", subject: build
+ = render "ci/status/icon_with_description", subject: build
Build
%strong ##{@build.id}
in pipeline
diff --git a/app/views/projects/ci/builds/_build.html.haml b/app/views/projects/ci/builds/_build.html.haml
index 6b0cd3e49a0..4257bb86859 100644
--- a/app/views/projects/ci/builds/_build.html.haml
+++ b/app/views/projects/ci/builds/_build.html.haml
@@ -9,7 +9,7 @@
%tr.build.commit{class: ('retried' if retried)}
%td.status
- = render "ci/status/icon_with_label", subject: build
+ = render "ci/status/icon_with_description", subject: build
%td.branch-commit
- if can?(current_user, :read_build, build)
diff --git a/app/views/projects/ci/pipelines/_pipeline.html.haml b/app/views/projects/ci/pipelines/_pipeline.html.haml
index 84243e4306d..6dff955ea3d 100644
--- a/app/views/projects/ci/pipelines/_pipeline.html.haml
+++ b/app/views/projects/ci/pipelines/_pipeline.html.haml
@@ -4,7 +4,7 @@
%tr.commit
%td.commit-link
- = render "ci/status/icon_with_label", subject: pipeline
+ = render "ci/status/icon_with_description", subject: pipeline
%td
= link_to namespace_project_pipeline_path(pipeline.project.namespace, pipeline.project, pipeline.id) do
diff --git a/app/views/projects/generic_commit_statuses/_generic_commit_status.html.haml b/app/views/projects/generic_commit_statuses/_generic_commit_status.html.haml
index 69cb1631ee8..1dd07ae1a2a 100644
--- a/app/views/projects/generic_commit_statuses/_generic_commit_status.html.haml
+++ b/app/views/projects/generic_commit_statuses/_generic_commit_status.html.haml
@@ -8,7 +8,7 @@
%tr.generic_commit_status{class: ('retried' if retried)}
%td.status
- = render "ci/status/icon_with_label", subject: generic_commit_status
+ = render "ci/status/icon_with_description", subject: generic_commit_status
%td.generic_commit_status-link
- if can?(current_user, :read_commit_status, generic_commit_status) && generic_commit_status.target_url
diff --git a/app/views/projects/pipelines/_info.html.haml b/app/views/projects/pipelines/_info.html.haml
index f7385184a2b..d05697b4ee3 100644
--- a/app/views/projects/pipelines/_info.html.haml
+++ b/app/views/projects/pipelines/_info.html.haml
@@ -1,6 +1,6 @@
.page-content-header
.header-main-content
- = render "ci/status/icon_with_label", subject: @pipeline
+ = render "ci/status/icon_with_description", subject: @pipeline
%strong Pipeline ##{@commit.pipelines.last.id}
triggered #{time_ago_with_tooltip(@commit.authored_date)} by
= author_avatar(@commit, size: 24)
diff --git a/app/views/projects/stage/_graph.html.haml b/app/views/projects/stage/_graph.html.haml
index 1d8fa10db0c..745b6d143f4 100644
--- a/app/views/projects/stage/_graph.html.haml
+++ b/app/views/projects/stage/_graph.html.haml
@@ -14,9 +14,9 @@
%li.build{ class: ("playable" if is_playable) }
.curve
.build-content
- = render "projects/#{status.to_partial_path}_pipeline", subject: status
+ = render 'ci/status/icon_with_name_and_action', subject: status
- else
%li.build
.curve
.dropdown.inline.build-content
- = render "projects/stage/in_stage_group", name: group_name, subject: grouped_statuses
+ = render 'projects/stage/in_stage_group', name: group_name, subject: grouped_statuses