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
e168b103
Commit
e168b103
authored
Dec 15, 2016
by
Mike Greiling
Committed by
Kamil Trzcinski
Dec 18, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add shared_runners_minutes setting for groups
parent
3aa3bb7f
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
15 additions
and
0 deletions
+15
-0
app/controllers/admin/groups_controller.rb
app/controllers/admin/groups_controller.rb
+1
-0
app/controllers/groups_controller.rb
app/controllers/groups_controller.rb
+1
-0
app/views/admin/groups/_form.html.haml
app/views/admin/groups/_form.html.haml
+2
-0
app/views/groups/_shared_runners_minutes_setting.html.haml
app/views/groups/_shared_runners_minutes_setting.html.haml
+9
-0
app/views/groups/edit.html.haml
app/views/groups/edit.html.haml
+2
-0
No files found.
app/controllers/admin/groups_controller.rb
View file @
e168b103
...
...
@@ -68,6 +68,7 @@ class Admin::GroupsController < Admin::ApplicationController
:path
,
:repository_size_limit
,
:request_access_enabled
,
:shared_runners_minutes_limit
,
:visibility_level
)
end
...
...
app/controllers/groups_controller.rb
View file @
e168b103
...
...
@@ -132,6 +132,7 @@ class GroupsController < Groups::ApplicationController
:repository_size_limit
,
:request_access_enabled
,
:share_with_group_lock
,
:shared_runners_minutes_limit
,
:visibility_level
)
end
...
...
app/views/admin/groups/_form.html.haml
View file @
e168b103
...
...
@@ -17,6 +17,8 @@
=
render
'groups/group_lfs_settings'
,
f:
f
=
render
'groups/shared_runners_minutes_setting'
,
f:
f
-
if
@group
.
new_record?
.form-group
.col-sm-offset-2.col-sm-10
...
...
app/views/groups/_shared_runners_minutes_setting.html.haml
0 → 100644
View file @
e168b103
-
if
current_user
.
admin?
.form-group
=
f
.
label
:shared_runners_minutes_limit
,
class:
'control-label'
do
Build Minutes Quota
.col-sm-10
=
f
.
number_field
:shared_runners_minutes_limit
,
class:
'form-control'
,
min:
0
%span
.help-block
#shared_runners_minutes_limit_help_block
Set the maximum number of minutes that a group can use shared runners in a one month period
=
link_to
icon
(
'question-circle'
),
help_page_path
(
"user/admin_area/settings/continuous_integration"
,
anchor:
"shared-runners-minutes"
)
app/views/groups/edit.html.haml
View file @
e168b103
...
...
@@ -30,6 +30,8 @@
=
render
'group_lfs_settings'
,
f:
f
=
render
'shared_runners_minutes_setting'
,
f:
f
.form-group
%hr
=
f
.
label
:membership_lock
,
class:
'control-label'
do
...
...
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