Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
71d0cfcf
Commit
71d0cfcf
authored
Oct 15, 2015
by
Kamil Trzcinski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make the builds view and warning notice nicer
parent
19cfa86a
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
6 deletions
+7
-6
app/helpers/runners_helper.rb
app/helpers/runners_helper.rb
+1
-1
app/views/projects/builds/_build.html.haml
app/views/projects/builds/_build.html.haml
+3
-0
app/views/projects/builds/show.html.haml
app/views/projects/builds/show.html.haml
+3
-5
No files found.
app/helpers/runners_helper.rb
View file @
71d0cfcf
...
@@ -15,7 +15,7 @@ module RunnersHelper
...
@@ -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
...
...
app/views/projects/builds/_build.html.haml
View file @
71d0cfcf
...
@@ -9,6 +9,9 @@
...
@@ -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
)
...
...
app/views/projects/builds/show.html.haml
View file @
71d0cfcf
...
@@ -44,16 +44,14 @@
...
@@ -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
...
...
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