Commit d1dd8935 authored by Kamil Trzcinski's avatar Kamil Trzcinski Committed by Grzegorz Bizon

Rename icon_with_label to icon_with_description

parent 980009e6
...@@ -91,7 +91,7 @@ ...@@ -91,7 +91,7 @@
%strong ##{build.id} %strong ##{build.id}
%td.status %td.status
= render "ci/status/icon_with_label", subject: build = render "ci/status/icon_with_description", subject: build
%td.status %td.status
- if project - if project
......
- detailed_status = subject.detailed_status(current_user) - detailed_status = subject.detailed_status(current_user)
- details_path = detailed_status.details_path if detailed_status.has_details? - details_path = detailed_status.details_path if detailed_status.has_details?
- klass = "ci-status ci-#{detailed_status}" - klass = "ci-status ci-#{detailed_status}"
- if details_path - if details_path
= link_to details_path, class: klass do = link_to details_path, class: klass do
= custom_icon(detailed_status.icon) = custom_icon(detailed_status.icon)
......
.content-block.build-header .content-block.build-header
.header-content .header-content
= render "ci/status/icon_with_label", subject: build = render "ci/status/icon_with_description", subject: build
Build Build
%strong ##{@build.id} %strong ##{@build.id}
in pipeline in pipeline
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
%tr.build.commit{class: ('retried' if retried)} %tr.build.commit{class: ('retried' if retried)}
%td.status %td.status
= render "ci/status/icon_with_label", subject: build = render "ci/status/icon_with_description", subject: build
%td.branch-commit %td.branch-commit
- if can?(current_user, :read_build, build) - if can?(current_user, :read_build, build)
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
%tr.commit %tr.commit
%td.commit-link %td.commit-link
= render "ci/status/icon_with_label", subject: pipeline = render "ci/status/icon_with_description", subject: pipeline
%td %td
= link_to namespace_project_pipeline_path(pipeline.project.namespace, pipeline.project, pipeline.id) do = link_to namespace_project_pipeline_path(pipeline.project.namespace, pipeline.project, pipeline.id) do
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
%tr.generic_commit_status{class: ('retried' if retried)} %tr.generic_commit_status{class: ('retried' if retried)}
%td.status %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 %td.generic_commit_status-link
- if can?(current_user, :read_commit_status, generic_commit_status) && generic_commit_status.target_url - if can?(current_user, :read_commit_status, generic_commit_status) && generic_commit_status.target_url
......
.page-content-header .page-content-header
.header-main-content .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} %strong Pipeline ##{@commit.pipelines.last.id}
triggered #{time_ago_with_tooltip(@commit.authored_date)} by triggered #{time_ago_with_tooltip(@commit.authored_date)} by
= author_avatar(@commit, size: 24) = author_avatar(@commit, size: 24)
......
...@@ -14,9 +14,9 @@ ...@@ -14,9 +14,9 @@
%li.build{ class: ("playable" if is_playable) } %li.build{ class: ("playable" if is_playable) }
.curve .curve
.build-content .build-content
= render "projects/#{status.to_partial_path}_pipeline", subject: status = render 'ci/status/icon_with_name_and_action', subject: status
- else - else
%li.build %li.build
.curve .curve
.dropdown.inline.build-content .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
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment