Merge branch 'remove-pipeline-tooltips' into 'master'

Remove redundant pipeline tooltips from short labels ## What does this MR do? Removes the tooltips from labels that have less than 12 characters, so that the tooltips only show when the pipeline labels are truncated ## Are there points in the code the reviewer needs to double check? None ## Why was this MR needed? Removes unnecessary tooltips for non-truncated pipeline labels ## Screenshots (if relevant) Before: ![NjBCzZ63NK](/uploads/2c5627f3000ceeeb134452a6619734f2/NjBCzZ63NK.gif) After: ![EHsGdjGi3F](/uploads/ffdc6f9c8e807ca4eaf576ee6a660798/EHsGdjGi3F.gif) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [x] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? #21542 See merge request !6058

Merge branch 'remove-pipeline-tooltips' into 'master'
1d89a8f9 · Fatih Acet · 7649497f · 0272d968 · 1d89a8f9 · 1d89a8f9
Commit 1d89a8f9 authored Aug 31, 2016 by Fatih Acet
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 2 deletions

CHANGELOG CHANGELOG +1 -0

_pipelines_list.haml app/views/projects/commit/_pipelines_list.haml +4 -1

index.html.haml app/views/projects/pipelines/index.html.haml +4 -1

No files found.
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -29,6 +29,7 @@ v 8.12.0 (unreleased)
  - Added project specific enable/disable setting for LFS !5997
  - Added tests for diff notes
  - Add a button to download latest successful artifacts for branches and tags !5142
+  - Remove redundant pipeline tooltips (ClemMakesApps)
  - Add delimiter to project stars and forks count (ClemMakesApps)
  - Fix badge count alignment (ClemMakesApps)
  - Fix branch title trailing space on hover (ClemMakesApps)

--- a/app/views/projects/commit/_pipelines_list.haml
+++ b/app/views/projects/commit/_pipelines_list.haml
@@ -10,7 +10,10 @@
          %th Commit
          - pipelines.stages.each do |stage|
            %th.stage
-              %span.has-tooltip{ title: "#{stage.titleize}" }
+              - if stage.titleize.length > 12
+                %span.has-tooltip{ title: "#{stage.titleize}" }
+                  = stage.titleize
+              - else
                = stage.titleize
          %th
          %th

--- a/app/views/projects/pipelines/index.html.haml
+++ b/app/views/projects/pipelines/index.html.haml
@@ -49,7 +49,10 @@
            %th Commit
            - stages.each do |stage|
              %th.stage
-                %span.has-tooltip{ title: "#{stage.titleize}" }
+                - if stage.titleize.length > 12
+                  %span.has-tooltip{ title: "#{stage.titleize}" }
+                    = stage.titleize
+                - else
                  = stage.titleize
            %th
            %th