diff options
author | James Lopez <james@jameslopez.es> | 2018-04-06 10:42:19 +0200 |
---|---|---|
committer | James Lopez <james@jameslopez.es> | 2018-04-06 10:42:19 +0200 |
commit | a63c76faa09b5c4b7d10a9beebd46a117b10648a (patch) | |
tree | 1fe39ff16a07660ca5f214c5f08e028f6a798060 /app/views/ci/status/_dropdown_graph_badge.html.haml | |
parent | 8ce1526652ec1feb818ef9a5558826987645fa19 (diff) | |
parent | 2faf991f31aceb1c34a3855695d25fab19203e36 (diff) | |
download | gitlab-ce-a63c76faa09b5c4b7d10a9beebd46a117b10648a.tar.gz |
Merge remote-tracking branch 'origin/master' into 10-7-stable-prepare-rc210-7-stable-prepare-rc2
Diffstat (limited to 'app/views/ci/status/_dropdown_graph_badge.html.haml')
-rw-r--r-- | app/views/ci/status/_dropdown_graph_badge.html.haml | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/app/views/ci/status/_dropdown_graph_badge.html.haml b/app/views/ci/status/_dropdown_graph_badge.html.haml index c5b4439e273..db2040110fa 100644 --- a/app/views/ci/status/_dropdown_graph_badge.html.haml +++ b/app/views/ci/status/_dropdown_graph_badge.html.haml @@ -3,14 +3,15 @@ - subject = local_assigns.fetch(:subject) - status = subject.detailed_status(current_user) - klass = "ci-status-icon ci-status-icon-#{status.group}" -- tooltip = "#{subject.name} - #{status.label}" +- tooltip = "#{subject.name} - #{status.status_tooltip}" - if status.has_details? - = link_to status.details_path, class: 'mini-pipeline-graph-dropdown-item', data: { toggle: 'tooltip', title: tooltip, container: 'body' } do + = link_to status.details_path, class: 'mini-pipeline-graph-dropdown-item', data: { toggle: 'tooltip', title: tooltip, html: true, container: 'body' } do %span{ class: klass }= sprite_icon(status.icon) %span.ci-build-text= subject.name + - else - .menu-item.mini-pipeline-graph-dropdown-item{ data: { toggle: 'tooltip', title: tooltip, container: 'body' } } + .menu-item.mini-pipeline-graph-dropdown-item{ data: { toggle: 'tooltip', html: true, title: tooltip, container: 'body' } } %span{ class: klass }= sprite_icon(status.icon) %span.ci-build-text= subject.name |