diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-10-26 14:42:39 -0500 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-10-26 14:42:39 -0500 |
| commit | 980819f8bb6b90018db285f09b07e25d26d1ed3a (patch) | |
| tree | 78edb6e8a4a7a539fddf1b682582bc5069a426ef | |
| parent | e4990b8c086ece77acbf915129248a3e514e7278 (diff) | |
| download | gitlab-ce-23868-build-graph-tooltips.tar.gz | |
Remove tooltips from build nodes23868-build-graph-tooltips
3 files changed, 6 insertions, 7 deletions
diff --git a/app/views/projects/ci/builds/_build_pipeline.html.haml b/app/views/projects/ci/builds/_build_pipeline.html.haml index 55965172d3f..93dca81e6f9 100644 --- a/app/views/projects/ci/builds/_build_pipeline.html.haml +++ b/app/views/projects/ci/builds/_build_pipeline.html.haml @@ -1,14 +1,13 @@ - is_playable = subject.playable? && can?(current_user, :update_build, @project) - if is_playable = link_to play_namespace_project_build_path(subject.project.namespace, subject.project, subject, return_to: request.original_url), method: :post, data: { toggle: 'tooltip', title: "#{subject.name} - play", container: '.pipeline-graph', placement: 'bottom' } do - = render_status_with_link('build', 'play') + = ci_icon_for_status('play') .ci-status-text= subject.name - elsif can?(current_user, :read_build, @project) = link_to namespace_project_build_path(subject.project.namespace, subject.project, subject), data: { toggle: 'tooltip', title: "#{subject.name} - #{subject.status}", container: '.pipeline-graph', placement: 'bottom' } do %span.ci-status-icon - = render_status_with_link('build', subject.status) + = ci_icon_for_status(subject.status) .ci-status-text= subject.name - else %span.ci-status-icon - = render_status_with_link('build', subject.status) - = ci_icon_for_status(subject.status) + = ci_icon_for_status(subject.status) diff --git a/app/views/projects/commit/_pipeline_status_group.html.haml b/app/views/projects/commit/_pipeline_status_group.html.haml index f2d71fa6989..18daa2ee693 100644 --- a/app/views/projects/commit/_pipeline_status_group.html.haml +++ b/app/views/projects/commit/_pipeline_status_group.html.haml @@ -1,7 +1,7 @@ - group_status = CommitStatus.where(id: subject).status %button.dropdown-menu-toggle.has-tooltip{ type: 'button', data: { toggle: 'dropdown', title: "#{name} - #{group_status}" } } %span.ci-status-icon - = render_status_with_link('build', group_status) + = ci_icon_for_status(group_status) %span.ci-status-text = name %span.badge= subject.size diff --git a/app/views/projects/generic_commit_statuses/_generic_commit_status_pipeline.html.haml b/app/views/projects/generic_commit_statuses/_generic_commit_status_pipeline.html.haml index c45b73e4225..1c457244a7a 100644 --- a/app/views/projects/generic_commit_statuses/_generic_commit_status_pipeline.html.haml +++ b/app/views/projects/generic_commit_statuses/_generic_commit_status_pipeline.html.haml @@ -2,9 +2,9 @@ - if subject.target_url = link_to subject.target_url do %span.ci-status-icon - = render_status_with_link('commit status', subject.status) + = ci_icon_for_status(subject.status) %span.ci-status-text= subject.name - else %span.ci-status-icon - = render_status_with_link('commit status', subject.status) + = ci_icon_for_status(subject.status) %span.ci-status-text= subject.name |