Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/doc/api
diff options
context:
space:
mode:
authorMark Chao <mchao@gitlab.com>2018-05-22 13:16:06 +0300
committerMark Chao <mchao@gitlab.com>2018-06-06 15:01:43 +0300
commitd5a303cf4d1d0182bb5462ca85beb29a5a821700 (patch)
treefa9ffd0368f9bd8d7b1b72af190459b5142cf3f3 /doc/api
parent7c965a24f51ca93196c27880843a6d187ea063cc (diff)
Doc update
Diffstat (limited to 'doc/api')
-rw-r--r--doc/api/access_requests.md2
-rw-r--r--doc/api/members.md2
-rw-r--r--doc/api/protected_branches.md10
-rw-r--r--doc/api/services.md2
4 files changed, 8 insertions, 8 deletions
diff --git a/doc/api/access_requests.md b/doc/api/access_requests.md
index 603fa4a8194..4b2014ca843 100644
--- a/doc/api/access_requests.md
+++ b/doc/api/access_requests.md
@@ -10,7 +10,7 @@
10 => Guest access
20 => Reporter access
30 => Developer access
-40 => Master access
+40 => Maintainer access
50 => Owner access # Only valid for groups
```
diff --git a/doc/api/members.md b/doc/api/members.md
index 3234f833eae..1a10aa75ac0 100644
--- a/doc/api/members.md
+++ b/doc/api/members.md
@@ -8,7 +8,7 @@ The access levels are defined in the `Gitlab::Access` module. Currently, these l
10 => Guest access
20 => Reporter access
30 => Developer access
-40 => Master access
+40 => Maintainer access
50 => Owner access # Only valid for groups
```
diff --git a/doc/api/protected_branches.md b/doc/api/protected_branches.md
index b4e891c915a..1e1b8270db6 100644
--- a/doc/api/protected_branches.md
+++ b/doc/api/protected_branches.md
@@ -8,7 +8,7 @@ The access levels are defined in the `ProtectedRefAccess::ALLOWED_ACCESS_LEVELS`
```
0 => No access
30 => Developer access
-40 => Master access
+40 => Maintainer access
```
## List protected branches
@@ -36,13 +36,13 @@ Example response:
"push_access_levels": [
{
"access_level": 40,
- "access_level_description": "Masters"
+ "access_level_description": "Maintainers"
}
],
"merge_access_levels": [
{
"access_level": 40,
- "access_level_description": "Masters"
+ "access_level_description": "Maintainers"
}
]
},
@@ -75,13 +75,13 @@ Example response:
"push_access_levels": [
{
"access_level": 40,
- "access_level_description": "Masters"
+ "access_level_description": "Maintainers"
}
],
"merge_access_levels": [
{
"access_level": 40,
- "access_level_description": "Masters"
+ "access_level_description": "Maintainers"
}
]
}
diff --git a/doc/api/services.md b/doc/api/services.md
index f23303ef836..aeb48ccc36c 100644
--- a/doc/api/services.md
+++ b/doc/api/services.md
@@ -1,6 +1,6 @@
# Services API
->**Note:** This API requires an access token with Master or Owner permissions
+>**Note:** This API requires an access token with Maintainer or Owner permissions
## Asana