diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-19 21:09:17 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-19 21:09:17 +0300 |
commit | 0eb4fd2f32e6804bc85868ba167170238e346279 (patch) | |
tree | c020e787ea29c77e1e9f53c21940f88a87a6e905 /doc/api | |
parent | 78d8830cec030ff12afed3c8ae1dddec454d0a24 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/api')
-rw-r--r-- | doc/api/group_activity_analytics.md | 8 | ||||
-rw-r--r-- | doc/api/projects.md | 3 |
2 files changed, 5 insertions, 6 deletions
diff --git a/doc/api/group_activity_analytics.md b/doc/api/group_activity_analytics.md index 2e93967fe64..23dcb46dbc5 100644 --- a/doc/api/group_activity_analytics.md +++ b/doc/api/group_activity_analytics.md @@ -23,9 +23,7 @@ curl --header "PRIVATE-TOKEN: <your_access_token>" https://gitlab.example.com/ap Example response: ```json -[ - { issues_count : 10 } -] +{ "issues_count": 10 } ``` ## Get count of recently created merge requests for group @@ -49,7 +47,5 @@ curl --header "PRIVATE-TOKEN: <your_access_token>" https://gitlab.example.com/ap Example response: ```json -[ - { merge_requests_count : 10 } -] +{ "merge_requests_count": 10 } ``` diff --git a/doc/api/projects.md b/doc/api/projects.md index a00bd442872..ae9f7de427d 100644 --- a/doc/api/projects.md +++ b/doc/api/projects.md @@ -1012,6 +1012,7 @@ POST /projects | `issues_access_level` | string | no | One of `disabled`, `private` or `enabled` | | `repository_access_level` | string | no | One of `disabled`, `private` or `enabled` | | `merge_requests_access_level` | string | no | One of `disabled`, `private` or `enabled` | +| `forking_access_level` | string | no | One of `disabled`, `private` or `enabled` | | `builds_access_level` | string | no | One of `disabled`, `private` or `enabled` | | `wiki_access_level` | string | no | One of `disabled`, `private` or `enabled` | | `snippets_access_level` | string | no | One of `disabled`, `private` or `enabled` | @@ -1080,6 +1081,7 @@ POST /projects/user/:user_id | `issues_access_level` | string | no | One of `disabled`, `private` or `enabled` | | `repository_access_level` | string | no | One of `disabled`, `private` or `enabled` | | `merge_requests_access_level` | string | no | One of `disabled`, `private` or `enabled` | +| `forking_access_level` | string | no | One of `disabled`, `private` or `enabled` | | `builds_access_level` | string | no | One of `disabled`, `private` or `enabled` | | `wiki_access_level` | string | no | One of `disabled`, `private` or `enabled` | | `snippets_access_level` | string | no | One of `disabled`, `private` or `enabled` | @@ -1147,6 +1149,7 @@ PUT /projects/:id | `issues_access_level` | string | no | One of `disabled`, `private` or `enabled` | | `repository_access_level` | string | no | One of `disabled`, `private` or `enabled` | | `merge_requests_access_level` | string | no | One of `disabled`, `private` or `enabled` | +| `forking_access_level` | string | no | One of `disabled`, `private` or `enabled` | | `builds_access_level` | string | no | One of `disabled`, `private` or `enabled` | | `wiki_access_level` | string | no | One of `disabled`, `private` or `enabled` | | `snippets_access_level` | string | no | One of `disabled`, `private` or `enabled` | |