Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Hampton <shampton@gitlab.com>2019-02-26 20:59:41 +0300
committerScott Hampton <shampton@gitlab.com>2019-02-26 20:59:41 +0300
commit2b51745394e8568cf91ce6ee95574f84fc38722e (patch)
treea79f06ab99d1985bee0458894d69d0a68867b2b0 /app/views/ci
parent506ac78d48b6a96081b02818c432650b8508913a (diff)
Removed other deprecated status helpers
Updating a couple other places that were still using deprecated status.
Diffstat (limited to 'app/views/ci')
-rw-r--r--app/views/ci/status/_icon.html.haml13
1 files changed, 5 insertions, 8 deletions
diff --git a/app/views/ci/status/_icon.html.haml b/app/views/ci/status/_icon.html.haml
index 1fd34eacdf7..1fcbd9e7545 100644
--- a/app/views/ci/status/_icon.html.haml
+++ b/app/views/ci/status/_icon.html.haml
@@ -1,13 +1,10 @@
- status = local_assigns.fetch(:status)
- size = local_assigns.fetch(:size, 16)
-- link = local_assigns.fetch(:link, true)
-- title = local_assigns.fetch(:title, "Pipeline: #{status.label}")
+- type = local_assigns.fetch(:type, 'pipeline')
+- title = local_assigns.fetch(:title, "#{type.titleize}: #{status.label}")
- tooltip_placement = local_assigns.fetch(:tooltip_placement, "left")
-- css_classes = "ci-status-link ci-status-icon ci-status-icon-#{status.group} #{'has-tooltip' if title.present?}"
+- css_classes = "ci-status-link ci-status-icon ci-status-icon-#{status.group} has-tooltip"
-- if link && status.has_details?
- = link_to status.details_path, class: css_classes, title: title, data: { html: title.present?, placement: tooltip_placement } do
- = sprite_icon(status.icon, size: size)
-- else
- %span{ class: css_classes, title: title, data: { html: title.present?, placement: tooltip_placement } }
+- if status.has_details?
+ = link_to status.details_path, class: css_classes, title: title, data: { html: true, placement: tooltip_placement } do
= sprite_icon(status.icon, size: size)