Resolve conflict

Fix tooltips in dropdown

1 files changed, 6 insertions, 6 deletions

diff --git a/app/views/ci/status/_graph_badge.html.haml b/app/views/ci/status/_graph_badge.html.haml
index 52b4d77d074..dd2f649de9a 100644
--- a/app/views/ci/status/_graph_badge.html.haml
+++ b/app/views/ci/status/_graph_badge.html.haml
@@ -3,18 +3,18 @@
 - 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}"
 
 - if status.has_details?
-  = link_to status.details_path, class: 'build-content' do
+  = link_to status.details_path, class: 'build-content has-tooltip', data: { toggle: 'tooltip', title: tooltip }  do
     %span{ class: klass }= custom_icon(status.icon)
-    .ci-status-text{ 'data-toggle' => 'tooltip', 'data-title' => "#{subject.name} - #{status.label}" }= subject.name
+    .ci-status-text= subject.name
 - else
-  .build-content
+  .build-content.has-tooltip{ data: { toggle: 'tooltip', title: tooltip } }
     %span{ class: klass }= custom_icon(status.icon)
-    .ci-status-text{ 'data-toggle' => 'tooltip', 'data-title' => "#{subject.name} - #{status.label}" }= subject.name
+    .ci-status-text= subject.name
 
 - if status.has_action?
-  = link_to status.action_path, method: status.action_method,
-    title: status.action_title, class: 'ci-action-icon-container' do
+  = link_to status.action_path, class: 'ci-action-icon-container has-tooltip', method: status.action_method, data: { toggle: 'tooltip', title: status.action_title }  do
     %i.ci-action-icon-wrapper
       = icon(status.action_icon, class: status.action_class)