Merge branch 'issue-mr-build-status-placement' into 'master'
Moves build status tooltip on issues See merge request !3156
This commit is contained in:
commit
5c1dba671d
|
@ -42,12 +42,12 @@ module CiStatusHelper
|
||||||
icon(icon_name + ' fw')
|
icon(icon_name + ' fw')
|
||||||
end
|
end
|
||||||
|
|
||||||
def render_ci_status(ci_commit)
|
def render_ci_status(ci_commit, tooltip_placement: 'auto left')
|
||||||
link_to ci_status_icon(ci_commit),
|
link_to ci_status_icon(ci_commit),
|
||||||
ci_status_path(ci_commit),
|
ci_status_path(ci_commit),
|
||||||
class: "ci-status-link ci-status-icon-#{ci_commit.status.dasherize}",
|
class: "ci-status-link ci-status-icon-#{ci_commit.status.dasherize}",
|
||||||
title: "Build #{ci_status_label(ci_commit)}",
|
title: "Build #{ci_status_label(ci_commit)}",
|
||||||
data: { toggle: 'tooltip', placement: 'left' }
|
data: { toggle: 'tooltip', placement: tooltip_placement }
|
||||||
end
|
end
|
||||||
|
|
||||||
def no_runners_for_project?(project)
|
def no_runners_for_project?(project)
|
||||||
|
|
|
@ -11,7 +11,7 @@
|
||||||
- elsif has_any_ci
|
- elsif has_any_ci
|
||||||
= icon('blank fw')
|
= icon('blank fw')
|
||||||
%span.merge-request-id
|
%span.merge-request-id
|
||||||
\!#{merge_request.iid}
|
= merge_request.to_reference
|
||||||
%span.merge-request-info
|
%span.merge-request-info
|
||||||
%strong
|
%strong
|
||||||
= link_to_gfm merge_request.title, merge_request_path(merge_request), class: "row_title"
|
= link_to_gfm merge_request.title, merge_request_path(merge_request), class: "row_title"
|
||||||
|
|
Loading…
Reference in New Issue