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
308aa151
Commit
308aa151
authored
May 25, 2017
by
Lin Jen-Shin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update doc and add changelog entry
parent
d88c4c12
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
2 deletions
+12
-2
changelogs/unreleased-ee/add-api-shared_runners_minutes_limit.yml
...gs/unreleased-ee/add-api-shared_runners_minutes_limit.yml
+4
-0
doc/api/groups.md
doc/api/groups.md
+3
-0
doc/api/users.md
doc/api/users.md
+4
-1
lib/api/groups.rb
lib/api/groups.rb
+1
-1
No files found.
changelogs/unreleased-ee/add-api-shared_runners_minutes_limit.yml
0 → 100644
View file @
308aa151
---
title
:
Add shared_runners_minutes_limit to groups and users API
merge_request
:
1942
author
:
doc/api/groups.md
View file @
308aa151
...
...
@@ -140,6 +140,7 @@ Example response:
"full_name"
:
"Twitter"
,
"full_path"
:
"twitter"
,
"parent_id"
:
null
,
"shared_runners_minutes_limit"
:
133
,
"projects"
:
[
{
"id"
:
7
,
...
...
@@ -290,6 +291,7 @@ Parameters:
-
`lfs_enabled`
(optional) - Enable/disable Large File Storage (LFS) for the projects in this group
-
`request_access_enabled`
(optional) - Allow users to request member access.
-
`parent_id`
(optional) - The parent group id for creating nested group.
-
`shared_runners_minutes_limit`
(optional) - (admin-only) Pipeline minutes quota for this group
## Transfer project to group
...
...
@@ -323,6 +325,7 @@ PUT /groups/:id
|
`visibility`
| string | no | The visibility level of the group. Can be
`private`
,
`internal`
, or
`public`
. |
|
`lfs_enabled`
(optional) | boolean | no | Enable/disable Large File Storage (LFS) for the projects in this group |
|
`request_access_enabled`
| boolean | no | Allow users to request member access. |
|
`shared_runners_minutes_limit`
| integer | no | (admin-only) Pipeline minutes quota for this group |
```
bash
curl
--request
PUT
--header
"PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK"
"https://gitlab.example.com/api/v4/groups/5?name=Experimental"
...
...
doc/api/users.md
View file @
308aa151
...
...
@@ -220,7 +220,8 @@ Parameters:
"can_create_group"
:
true
,
"can_create_project"
:
true
,
"two_factor_enabled"
:
true
,
"external"
:
false
"external"
:
false
,
"shared_runners_minutes_limit"
:
133
}
```
...
...
@@ -253,6 +254,7 @@ Parameters:
-
`can_create_group`
(optional) - User can create groups - true or false
-
`confirm`
(optional) - Require confirmation - true (default) or false
-
`external`
(optional) - Flags the user as external - true or false(default)
-
`shared_runners_minutes_limit`
(optional) - Pipeline minutes quota for this user
## User modification
...
...
@@ -281,6 +283,7 @@ Parameters:
-
`admin`
(optional) - User is admin - true or false (default)
-
`can_create_group`
(optional) - User can create groups - true or false
-
`external`
(optional) - Flags the user as external - true or false(default)
-
`shared_runners_minutes_limit`
(optional) - Pipeline minutes quota for this user
On password update, user will be forced to change it upon next login.
Note, at the moment this method does only return a
`404`
error,
...
...
lib/api/groups.rb
View file @
308aa151
...
...
@@ -17,7 +17,7 @@ module API
optional
:membership_lock
,
type:
Boolean
,
desc:
'Prevent adding new members to project membership within this group'
optional
:ldap_cn
,
type:
String
,
desc:
'LDAP Common Name'
optional
:ldap_access
,
type:
Integer
,
desc:
'A valid access level'
optional
:shared_runners_minutes_limit
,
type:
Integer
,
desc:
'Pipeline minutes quota for this group'
optional
:shared_runners_minutes_limit
,
type:
Integer
,
desc:
'
(admin-only)
Pipeline minutes quota for this group'
all_or_none_of
:ldap_cn
,
:ldap_access
end
...
...
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