Merge branch 'build-view-ui-fixes' into 'master'

Build View UI fixes



See merge request !1608
This commit is contained in:
Kamil Trzciński 2015-10-15 16:18:01 +00:00
commit 6df06ded12
3 changed files with 7 additions and 6 deletions

View file

@ -15,7 +15,7 @@ module RunnersHelper
end end
def runner_link(runner) def runner_link(runner)
display_name = truncate(runner.display_name, length: 20) display_name = truncate(runner.display_name, length: 15)
id = "\##{runner.id}" id = "\##{runner.id}"
if current_user && current_user.admin if current_user && current_user.admin

View file

@ -9,6 +9,9 @@
- else - else
%strong Build ##{build.id} %strong Build ##{build.id}
- if build.show_warning?
%i.fa.fa-warning.text-warning
%td %td
= link_to build.short_sha, namespace_project_commit_path(@project.namespace, @project, build.sha) = link_to build.short_sha, namespace_project_commit_path(@project.namespace, @project, build.sha)

View file

@ -44,16 +44,14 @@
.bs-callout.bs-callout-warning .bs-callout.bs-callout-warning
%p %p
- if no_runners_for_project?(@build.project) - if no_runners_for_project?(@build.project)
This build is stuck, because the project doesn't have runners assigned. This build is stuck, because the project doesn't have any runners online assigned to it.
- elsif @build.tags.any? - elsif @build.tags.any?
This build is stuck. This build is stuck, because you don't have any active runners online with any of these tags assigned to them:
%br
This build is stuck, because you don't have any active runners online with these tags assigned to the project:
- @build.tags.each do |tag| - @build.tags.each do |tag|
%span.label.label-primary %span.label.label-primary
= tag = tag
- else - else
This build is stuck, because you don't have any active runners online that can run this build. This build is stuck, because you don't have any active runners that can run this build.
%br %br
Go to Go to