diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2016-12-19 23:15:50 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2016-12-19 23:15:50 +0000 |
| commit | 1b449ba0735531df406b4fbe6e021eae2f8bf770 (patch) | |
| tree | 3945740c8a5bc7e2d4b77daf96c2f5e1c140e8bf /app/views/ci | |
| parent | 34e317d21ce49c122beb73d2eb695311b75d0b89 (diff) | |
| parent | d1d1e7c6d70b23d614e6e6ba482e6fa5fa96f582 (diff) | |
| download | gitlab-ce-1b449ba0735531df406b4fbe6e021eae2f8bf770.tar.gz | |
Merge branch 'master' into 19703-direct-link-pipelines
* master: (32 commits)
Update CHANGELOG.md for 8.13.10
Update CHANGELOG.md for 8.14.5
Add Wiki import to BB importer
Make CI badge hitboxes better match container
Move admin broadcast messages spinach feature to rspec
Move Admin Appearance spinach feature to rspec
Fix MR issue to do with merge user
Check if selected object is valid before passing to calback
Fix for missing service when importing from EE to CE
Fix tests because now we don't convert values
Spaces for literal hash
updated spec
Keep the value type for YAML variables
Test if expanded_environment_name could expand var
Fix duplicated build token problem and added relevant spec
Just implement it in the block
Move admin labels spinach test to rspec
Bring back "notification-dropdown" class for styling and use "js-notification-dropdown" for JavaScript
Fix 500 error for invalid path when visiting blame page
Add sentence casing, fix groups page buttons, fix dark gray variable
...
Diffstat (limited to 'app/views/ci')
| -rw-r--r-- | app/views/ci/status/_graph_badge.html.haml | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/app/views/ci/status/_graph_badge.html.haml b/app/views/ci/status/_graph_badge.html.haml index 9f3a9c0c6b2..52b4d77d074 100644 --- a/app/views/ci/status/_graph_badge.html.haml +++ b/app/views/ci/status/_graph_badge.html.haml @@ -5,12 +5,13 @@ - klass = "ci-status-icon ci-status-icon-#{status.group}" - if status.has_details? - = link_to status.details_path, data: { toggle: 'tooltip', title: "#{subject.name} - #{status.label}" } do + = link_to status.details_path, class: 'build-content' do %span{ class: klass }= custom_icon(status.icon) - .ci-status-text= subject.name + .ci-status-text{ 'data-toggle' => 'tooltip', 'data-title' => "#{subject.name} - #{status.label}" }= subject.name - else - %span{ class: klass }= custom_icon(status.icon) - .ci-status-text= subject.name + .build-content + %span{ class: klass }= custom_icon(status.icon) + .ci-status-text{ 'data-toggle' => 'tooltip', 'data-title' => "#{subject.name} - #{status.label}" }= subject.name - if status.has_action? = link_to status.action_path, method: status.action_method, |