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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
2e7f8cfd
Commit
2e7f8cfd
authored
Nov 10, 2020
by
Adrien Kohlbecker
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Separate paginated areas
parent
bb334986
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
app/controllers/projects/settings/ci_cd_controller.rb
app/controllers/projects/settings/ci_cd_controller.rb
+2
-2
app/views/projects/runners/_specific_runners.html.haml
app/views/projects/runners/_specific_runners.html.haml
+2
-2
No files found.
app/controllers/projects/settings/ci_cd_controller.rb
View file @
2e7f8cfd
...
...
@@ -110,13 +110,13 @@ module Projects
end
def
define_runners_variables
@project_runners
=
@project
.
runners
.
ordered
.
page
(
params
[
:page
]).
per
(
NUMBER_OF_RUNNERS_PER_PAGE
).
with_tags
@project_runners
=
@project
.
runners
.
ordered
.
page
(
params
[
:p
roject_p
age
]).
per
(
NUMBER_OF_RUNNERS_PER_PAGE
).
with_tags
@assignable_runners
=
current_user
.
ci_owned_runners
.
assignable_for
(
project
)
.
ordered
.
page
(
params
[
:page
]).
per
(
NUMBER_OF_RUNNERS_PER_PAGE
)
.
page
(
params
[
:
specific_
page
]).
per
(
NUMBER_OF_RUNNERS_PER_PAGE
)
@shared_runners
=
::
Ci
::
Runner
.
instance_type
.
active
...
...
app/views/projects/runners/_specific_runners.html.haml
View file @
2e7f8cfd
...
...
@@ -17,10 +17,10 @@
%h4
.underlined-title
=
_
(
'Runners activated for this project'
)
%ul
.bordered-list.activated-specific-runners
=
render
partial:
'projects/runners/runner'
,
collection:
@project_runners
,
as: :runner
=
paginate
@project_runners
,
theme:
"gitlab"
,
param
s:
{
expand_runners:
true
,
anchor:
'#
js-runners-settings'
}
=
paginate
@project_runners
,
theme:
"gitlab"
,
param
_name:
"project_page"
,
params:
{
expand_runners:
true
,
anchor:
'
js-runners-settings'
}
-
if
@assignable_runners
.
any?
%h4
.underlined-title
=
_
(
'Available specific runners'
)
%ul
.bordered-list.available-specific-runners
=
render
partial:
'projects/runners/runner'
,
collection:
@assignable_runners
,
as: :runner
=
paginate
@assignable_runners
,
theme:
"gitlab"
,
:params
=>
{
:anchor
=>
'#js-runners-settings'
}
=
paginate
@assignable_runners
,
theme:
"gitlab"
,
param_name:
"specific_page"
,
:params
=>
{
:anchor
=>
'js-runners-settings'
}
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