Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
heptapod
heptapod
Commits
6d249a42fc89
Commit
6df06ded
authored
Oct 15, 2015
by
Kamil Trzciński
Browse files
Merge branch 'build-view-ui-fixes' into 'master'
Build View UI fixes See merge request !1608
parents
3e0304dbc004
1b8ec23e43c1
Changes
3
Hide whitespace changes
Inline
Side-by-side
app/helpers/runners_helper.rb
View file @
6d249a42
...
...
@@ -15,7 +15,7 @@ def runner_status_icon(runner)
end
def
runner_link
(
runner
)
display_name
=
truncate
(
runner
.
display_name
,
length:
20
)
display_name
=
truncate
(
runner
.
display_name
,
length:
15
)
id
=
"
\#
#{
runner
.
id
}
"
if
current_user
&&
current_user
.
admin
...
...
app/views/projects/builds/_build.html.haml
View file @
6d249a42
...
...
@@ -9,6 +9,9 @@
-
else
%strong
Build ##{build.id}
-
if
build
.
show_warning?
%i
.fa.fa-warning.text-warning
%td
=
link_to
build
.
short_sha
,
namespace_project_commit_path
(
@project
.
namespace
,
@project
,
build
.
sha
)
...
...
app/views/projects/builds/show.html.haml
View file @
6d249a42
...
...
@@ -44,16 +44,14 @@
.bs-callout.bs-callout-warning
%p
-
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?
This build is stuck.
%br
This build is stuck, because you don't have any active runners online with these tags assigned to the project:
This build is stuck, because you don't have any active runners online with any of these tags assigned to them:
-
@build
.
tags
.
each
do
|
tag
|
%span
.label.label-primary
=
tag
-
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
Go to
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment