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
Léo-Paul Géneau
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
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
19 additions
and
12 deletions
+19
-12
app/controllers/ci/admin/runners_controller.rb
app/controllers/ci/admin/runners_controller.rb
+1
-0
app/views/ci/admin/runners/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
...
@@ -17,6 +17,7 @@ module Ci
@projects
=
@projects
.
where
(
gitlab_id:
@gl_projects
.
select
(
:id
))
@projects
=
@projects
.
where
(
gitlab_id:
@gl_projects
.
select
(
:id
))
end
end
@projects
=
@projects
.
where
(
"ci_projects.id NOT IN (?)"
,
@runner
.
projects
.
pluck
(
:id
))
if
@runner
.
projects
.
any?
@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
)
@projects
=
@projects
.
page
(
params
[
:page
]).
per
(
30
)
end
end
...
...
app/views/ci/admin/runners/show.html.haml
View file @
2afb2d3c
...
@@ -53,13 +53,14 @@
...
@@ -53,13 +53,14 @@
%th
%th
-
@runner
.
runner_projects
.
each
do
|
runner_project
|
-
@runner
.
runner_projects
.
each
do
|
runner_project
|
-
project
=
runner_project
.
project
-
project
=
runner_project
.
project
%tr
.alert-info
-
if
project
.
gl_project
%td
%tr
.alert-info
%strong
%td
=
project
.
name
%strong
%td
=
project
.
name
.pull-right
%td
=
link_to
'Disable'
,
[
:ci
,
:admin
,
project
,
runner_project
],
method: :delete
,
class:
'btn btn-danger btn-xs'
.pull-right
=
link_to
'Disable'
,
[
:ci
,
:admin
,
project
,
runner_project
],
method: :delete
,
class:
'btn btn-danger btn-xs'
%table
.table
%table
.table
%thead
%thead
...
@@ -103,21 +104,26 @@
...
@@ -103,21 +104,26 @@
%th
Finished at
%th
Finished at
-
@builds
.
each
do
|
build
|
-
@builds
.
each
do
|
build
|
-
gl_project
=
build
.
gl_project
%tr
.build
%tr
.build
%td
.id
%td
.id
-
gl_project
=
build
.
project
.
gl_project
-
if
gl_project
=
link_to
namespace_project_build_path
(
gl_project
.
namespace
,
gl_project
,
build
)
do
=
link_to
namespace_project_build_path
(
gl_project
.
namespace
,
gl_project
,
build
)
do
=
build
.
id
-
else
=
build
.
id
=
build
.
id
%td
.status
%td
.status
=
ci_status_with_icon
(
build
.
status
)
=
ci_status_with_icon
(
build
.
status
)
%td
.status
%td
.status
=
build
.
project
.
name
-
if
gl_project
=
gl_project
.
name_with_namespace
%td
.build-link
%td
.build-link
=
link_to
ci_status_path
(
build
.
commit
)
do
-
if
gl_project
%strong
#{
build
.
commit
.
short_sha
}
=
link_to
ci_status_path
(
build
.
commit
)
do
%strong
#{
build
.
commit
.
short_sha
}
%td
.timestamp
%td
.timestamp
-
if
build
.
finished_at
-
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