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
bb4ae381
Commit
bb4ae381
authored
Jan 04, 2017
by
Mike Greiling
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
move shared runner limits admin setting into a partial to reduce merge conflicts
parent
7d293e5a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
8 deletions
+11
-8
app/views/admin/application_settings/_form.html.haml
app/views/admin/application_settings/_form.html.haml
+3
-8
app/views/admin/application_settings/_shared_runners_minutes_setting.html.haml
...cation_settings/_shared_runners_minutes_setting.html.haml
+8
-0
No files found.
app/views/admin/application_settings/_form.html.haml
View file @
bb4ae381
...
@@ -215,14 +215,9 @@
...
@@ -215,14 +215,9 @@
=
f
.
label
:shared_runners_enabled
do
=
f
.
label
:shared_runners_enabled
do
=
f
.
check_box
:shared_runners_enabled
=
f
.
check_box
:shared_runners_enabled
Enable shared runners for new projects
Enable shared runners for new projects
.form-group
=
f
.
label
:shared_runners_minutes
,
'Build minutes quota'
,
class:
'control-label col-sm-2'
=
render
'shared_runners_minutes_setting'
,
form:
f
.col-sm-10
=
f
.
number_field
:shared_runners_minutes
,
class:
'form-control'
.help-block
Set the maximum number of build minutes that a group can use on shared runners per month.
0 for unlimited.
=
link_to
"(?)"
,
help_page_path
(
"user/admin_area/settings/continuous_integration"
,
anchor:
"shared-runners-minutes"
)
.form-group
.form-group
=
f
.
label
:shared_runners_text
,
class:
'control-label col-sm-2'
=
f
.
label
:shared_runners_text
,
class:
'control-label col-sm-2'
.col-sm-10
.col-sm-10
...
...
app/views/admin/application_settings/_shared_runners_minutes_setting.html.haml
0 → 100644
View file @
bb4ae381
.form-group
=
form
.
label
:shared_runners_minutes
,
'Build minutes quota'
,
class:
'control-label col-sm-2'
.col-sm-10
=
form
.
number_field
:shared_runners_minutes
,
class:
'form-control'
.help-block
Set the maximum number of build minutes that a group can use on shared runners per month.
0 for unlimited.
=
link_to
"(?)"
,
help_page_path
(
"user/admin_area/settings/continuous_integration"
,
anchor:
"shared-runners-minutes"
)
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