BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
2afb2d3c
Commit
2afb2d3c
authored
Oct 23, 2015
by
Kamil Trzcinski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix broken Runners admin page
parent
f230b42f
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
19 additions
and
12 deletions
+19
-12
runners_controller.rb
app/controllers/ci/admin/runners_controller.rb
+1
-0
show.html.haml
app/views/ci/admin/runners/show.html.haml
+18
-12
No files found.
app/controllers/ci/admin/runners_controller.rb
View file @
2afb2d3c
...
...
@@ -17,6 +17,7 @@ module Ci
@projects
=
@projects
.
where
(
gitlab_id:
@gl_projects
.
select
(
:id
))
end
@projects
=
@projects
.
where
(
"ci_projects.id NOT IN (?)"
,
@runner
.
projects
.
pluck
(
:id
))
if
@runner
.
projects
.
any?
@projects
=
@projects
.
joins
(
:gl_project
)
@projects
=
@projects
.
page
(
params
[
:page
]).
per
(
30
)
end
...
...
app/views/ci/admin/runners/show.html.haml
View file @
2afb2d3c
...
...
@@ -53,13 +53,14 @@
%th
-
@runner
.
runner_projects
.
each
do
|
runner_project
|
-
project
=
runner_project
.
project
%tr
.alert-info
%td
%strong
=
project
.
name
%td
.pull-right
=
link_to
'Disable'
,
[
:ci
,
:admin
,
project
,
runner_project
],
method: :delete
,
class:
'btn btn-danger btn-xs'
-
if
project
.
gl_project
%tr
.alert-info
%td
%strong
=
project
.
name
%td
.pull-right
=
link_to
'Disable'
,
[
:ci
,
:admin
,
project
,
runner_project
],
method: :delete
,
class:
'btn btn-danger btn-xs'
%table
.table
%thead
...
...
@@ -103,21 +104,26 @@
%th
Finished at
-
@builds
.
each
do
|
build
|
-
gl_project
=
build
.
gl_project
%tr
.build
%td
.id
-
gl_project
=
build
.
project
.
gl_project
=
link_to
namespace_project_build_path
(
gl_project
.
namespace
,
gl_project
,
build
)
do
-
if
gl_project
=
link_to
namespace_project_build_path
(
gl_project
.
namespace
,
gl_project
,
build
)
do
=
build
.
id
-
else
=
build
.
id
%td
.status
=
ci_status_with_icon
(
build
.
status
)
%td
.status
=
build
.
project
.
name
-
if
gl_project
=
gl_project
.
name_with_namespace
%td
.build-link
=
link_to
ci_status_path
(
build
.
commit
)
do
%strong
#{
build
.
commit
.
short_sha
}
-
if
gl_project
=
link_to
ci_status_path
(
build
.
commit
)
do
%strong
#{
build
.
commit
.
short_sha
}
%td
.timestamp
-
if
build
.
finished_at
...
...
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