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
9671ca19
Commit
9671ca19
authored
Jul 03, 2019
by
Achilleas Pipinellis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Re-align CE and EE API docs
parent
9b06890d
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
48 additions
and
7 deletions
+48
-7
doc/api/group_boards.md
doc/api/group_boards.md
+20
-2
doc/api/users.md
doc/api/users.md
+28
-5
No files found.
doc/api/group_boards.md
View file @
9671ca19
...
@@ -27,7 +27,16 @@ Example response:
...
@@ -27,7 +27,16 @@ Example response:
[
[
{
{
"id"
:
1
,
"id"
:
1
,
"group_id"
:
5
,
"name:"
:
"group issue board"
,
"group"
:
{
"id"
:
5
,
"name"
:
"Documentcloud"
,
"web_url"
:
"http://example.com/groups/documentcloud"
},
"milestone"
:
{
"id"
:
12
"title"
:
"10.0"
},
"lists"
:
[
"lists"
:
[
{
{
"id"
:
1
,
"id"
:
1
,
...
@@ -136,7 +145,16 @@ Example response:
...
@@ -136,7 +145,16 @@ Example response:
```
json
```
json
{
{
"id"
:
1
,
"id"
:
1
,
"group_id"
:
5
,
"name:"
:
"group issue board"
,
"group"
:
{
"id"
:
5
,
"name"
:
"Documentcloud"
,
"web_url"
:
"http://example.com/groups/documentcloud"
},
"milestone"
:
{
"id"
:
12
"title"
:
"10.0"
},
"lists"
:
[
"lists"
:
[
{
{
"id"
:
1
,
"id"
:
1
,
...
...
doc/api/users.md
View file @
9671ca19
...
@@ -147,6 +147,24 @@ GET /users
...
@@ -147,6 +147,24 @@ GET /users
]
]
```
```
Users on GitLab
[
Silver or higher
](
https://about.gitlab.com/pricing/
)
will also see
the
`group_saml`
provider option:
```
json
[
{
"id"
:
1
,
...
"identities"
:
[
{
"provider"
:
"github"
,
"extern_uid"
:
"2435223452345"
},
{
"provider"
:
"bitbucket"
,
"extern_uid"
:
"john.smith"
},
{
"provider"
:
"google_oauth2"
,
"extern_uid"
:
"8776128412476123468721346"
},
{
"provider"
:
"group_saml"
,
"extern_uid"
:
"123789"
,
"saml_provider_id"
:
10
}
],
...
}
]
You
can
lookup
users
by
external
UID
and
provider:
You
can
lookup
users
by
external
UID
and
provider:
```
```
...
@@ -260,14 +278,13 @@ Example Responses:
...
@@ -260,14 +278,13 @@ Example Responses:
"can_create_project": true,
"can_create_project": true,
"two_factor_enabled": true,
"two_factor_enabled": true,
"external": false,
"external": false,
"private_profile"
:
false
,
"private_profile": false
"shared_runners_minutes_limit"
:
133
"extra_shared_runners_minutes_limit"
:
133
}
}
```
```
Users on GitLab [Starter, Bronze, or higher](https://about.gitlab.com/pricing/) will also see
Users on GitLab [Starter, Bronze, or higher](https://about.gitlab.com/pricing/) will also see
the
`shared_runners_minutes_limit`
and
`extra_shared_runners_minutes_limit`
parameters:
**[STARTER]**
the `shared_runners_minutes_limit` and `extra_shared_runners_minutes_limit` parameters.
Users on GitLab Silver will also see the `group_saml` option:
```
json
```
json
{
{
...
@@ -275,6 +292,12 @@ the `shared_runners_minutes_limit` and `extra_shared_runners_minutes_limit` para
...
@@ -275,6 +292,12 @@ the `shared_runners_minutes_limit` and `extra_shared_runners_minutes_limit` para
"username": "john_smith",
"username": "john_smith",
"shared_runners_minutes_limit": 133,
"shared_runners_minutes_limit": 133,
"extra_shared_runners_minutes_limit": 133
"extra_shared_runners_minutes_limit": 133
"identities": [
{"provider": "github", "extern_uid": "2435223452345"},
{"provider": "bitbucket", "extern_uid": "john.smith"},
{"provider": "google_oauth2", "extern_uid": "8776128412476123468721346"},
{"provider": "group_saml", "extern_uid": "123789", "saml_provider_id": 10}
],
...
...
}
}
```
```
...
...
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