From 2d7bc6959606bc9af5144463433507685f81a9a0 Mon Sep 17 00:00:00 2001
From: Rydkin Maxim <maks.rydkin@gmail.com>
Date: Sun, 19 Mar 2017 21:04:45 +0300
Subject: [PATCH] adds tooltips into several places

---
 app/helpers/ci_status_helper.rb               | 4 ++++
 app/views/ci/status/_badge.html.haml          | 9 +++++----
 app/views/projects/builds/_header.html.haml   | 2 +-
 app/views/projects/ci/builds/_build.html.haml | 2 +-
 app/views/projects/pipelines/_info.html.haml  | 2 +-
 5 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/app/helpers/ci_status_helper.rb b/app/helpers/ci_status_helper.rb
index 2de9e0de310..88e18500430 100644
--- a/app/helpers/ci_status_helper.rb
+++ b/app/helpers/ci_status_helper.rb
@@ -121,4 +121,8 @@ module CiStatusHelper
       status.respond_to?(:label) &&
       status.respond_to?(:icon)
   end
+
+  def status_title(pipeline)
+    "This pipeline is redundant as a newer pipeline exists (canceled by ##{pipeline.auto_canceled_by_id} pipeline)" if pipeline.auto_canceled_by_id? && pipeline.canceled?
+  end
 end
diff --git a/app/views/ci/status/_badge.html.haml b/app/views/ci/status/_badge.html.haml
index c00c7f7407e..c4ff1b5bdc9 100644
--- a/app/views/ci/status/_badge.html.haml
+++ b/app/views/ci/status/_badge.html.haml
@@ -1,12 +1,13 @@
 - status = local_assigns.fetch(:status)
-- link = local_assigns.fetch(:link, true)
-- css_classes = "ci-status ci-#{status.group}"
+- link   = local_assigns.fetch(:link, true)
+- title  = local_assigns.fetch(:title, nil)
+- css_classes = "ci-status ci-#{status.group} #{'has-tooltip' if title.present? }"
 
 - if link && status.has_details?
-  = link_to status.details_path, class: css_classes do
+  = link_to status.details_path, class: css_classes, title: title do
     = custom_icon(status.icon)
     = status.text
 - else
-  %span{ class: css_classes }
+  %span{ class: css_classes, title: title }
     = custom_icon(status.icon)
     = status.text
diff --git a/app/views/projects/builds/_header.html.haml b/app/views/projects/builds/_header.html.haml
index 7eb17e887e7..aeb1dba4b3f 100644
--- a/app/views/projects/builds/_header.html.haml
+++ b/app/views/projects/builds/_header.html.haml
@@ -1,6 +1,6 @@
 .content-block.build-header.top-area
   .header-content
-    = render 'ci/status/badge', status: @build.detailed_status(current_user), link: false
+    = render 'ci/status/badge', status: @build.detailed_status(current_user), link: false, title: status_title(@build.pipeline)
     Job
     %strong.js-build-id ##{@build.id}
     in pipeline
diff --git a/app/views/projects/ci/builds/_build.html.haml b/app/views/projects/ci/builds/_build.html.haml
index aeed293a724..b9ec59df3ca 100644
--- a/app/views/projects/ci/builds/_build.html.haml
+++ b/app/views/projects/ci/builds/_build.html.haml
@@ -9,7 +9,7 @@
 
 %tr.build.commit{ class: ('retried' if retried) }
   %td.status
-    = render "ci/status/badge", status: build.detailed_status(current_user)
+    = render "ci/status/badge", status: build.detailed_status(current_user), title: status_title(build.pipeline)
 
   %td.branch-commit
     - if can?(current_user, :read_build, build)
diff --git a/app/views/projects/pipelines/_info.html.haml b/app/views/projects/pipelines/_info.html.haml
index 4be9a1371ec..17f38cef718 100644
--- a/app/views/projects/pipelines/_info.html.haml
+++ b/app/views/projects/pipelines/_info.html.haml
@@ -1,6 +1,6 @@
 .page-content-header
   .header-main-content
-    = render 'ci/status/badge', status: @pipeline.detailed_status(current_user)
+    = render 'ci/status/badge', status: @pipeline.detailed_status(current_user), title: status_title(@pipeline)
     %strong Pipeline ##{@pipeline.id}
     triggered #{time_ago_with_tooltip(@pipeline.created_at)}
     - if @pipeline.user