Resolve conflict

Fix tooltips in dropdown

app/assets/stylesheets/pages/pipelines.scss

@@ -463,15 +463,11 @@
     white-space: normal;
     color: $gl-text-color-light;
 
-<<<<<<< HEAD
-
     .dropdown-menu-toggle {
       background-color: transparent;
       border: none;
       padding: 0;
       color: $gl-text-color-light;
-      flex-grow: 1;
-
 
       &:focus {
         outline: none;
@@ -486,10 +482,6 @@
       }
     }
 
-    &:hover {
-      background-color: $stage-hover-bg;
-      border: 1px solid $stage-hover-border;
-=======
     > .build-content {
       display: inline-block;
       padding: 8px 10px 9px;
@@ -497,7 +489,6 @@
       border: 1px solid $border-color;
       border-radius: 30px;
       background-color: $white-light;
->>>>>>> master
       
       &:hover {
         background-color: $stage-hover-bg;
@@ -603,22 +594,7 @@
       }
     }
   }
-
-  // Position in the pipeline graph
-  .grouped-pipeline-dropdown {
-<<<<<<< HEAD
-    right: -206px;
-    top: -11px;
-  }
 }
-=======
-    padding: 0;
-    width: 191px;
-    left: auto;
-    right: -195px;
-    top: -4px;
-    box-shadow: 0 1px 5px $black-transparent;
->>>>>>> master
 
 .dropdown-counter-badge {
   float: right;
@@ -632,8 +608,8 @@
   padding: 0;
   width: 191px;
   left: auto;
-  right: -206px;
-  top: -11px;
+  right: -195px;
+  top: -4px;
   box-shadow: 0 1px 5px $black-transparent;
 
   a {
@@ -644,53 +620,10 @@
     }
   }
 
-<<<<<<< HEAD
   ul {
     max-height: 245px;
     overflow: auto;
     margin: 5px 0;
-=======
-    .dropdown-build {
-      color: $gl-text-color-light;
-
-      .build-content {
-        width: 100%;
-      }
-
-      .ci-action-icon-container {
-        font-size: 11px;
-        position: absolute;
-        right: 4px;
-
-        i {
-          width: 25px;
-          height: 25px;
-          font-size: 11px;
-          margin-top: 0;
-
-          &::before {
-            top: 1px;
-            left: 1px;
-          }
-        }
-      }
-
-      &:hover {
-        background-color: $stage-hover-bg;
-        border-radius: 3px;
-        color: $gl-text-color;
-      }
-
-      .stage {
-        max-width: 100px;
-        width: 100px;
-      }
-
-      .ci-status-icon svg {
-        height: 18px;
-        width: 18px;
-      }
->>>>>>> master
 
     li {
       padding-top: 2px;
@@ -747,7 +680,7 @@
 .dropdown-build {
   color: $gl-text-color-light;
 
-  a.ci-action-icon-container {
+  .ci-action-icon-container {
     padding: 0;
     font-size: 11px;
     float: right;

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)