summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/api/protected_branches.md4
-rw-r--r--doc/user/index.md2
-rw-r--r--doc/user/permissions.md2
-rw-r--r--doc/user/project/clusters/index.md2
-rw-r--r--doc/user/project/integrations/index.md2
-rw-r--r--doc/user/project/settings/import_export.md2
-rw-r--r--doc/workflow/lfs/manage_large_binaries_with_git_lfs.md2
7 files changed, 8 insertions, 8 deletions
diff --git a/doc/api/protected_branches.md b/doc/api/protected_branches.md
index 1e1b8270db6..f6813f27dc0 100644
--- a/doc/api/protected_branches.md
+++ b/doc/api/protected_branches.md
@@ -104,8 +104,8 @@ curl --request POST --header "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" 'https://gitl
| --------- | ---- | -------- | ----------- |
| `id` | integer/string | yes | The ID or [URL-encoded path of the project](README.md#namespaced-path-encoding) owned by the authenticated user |
| `name` | string | yes | The name of the branch or wildcard |
-| `push_access_level` | string | no | Access levels allowed to push (defaults: `40`, master access level) |
-| `merge_access_level` | string | no | Access levels allowed to merge (defaults: `40`, master access level) |
+| `push_access_level` | string | no | Access levels allowed to push (defaults: `40`, maintainer access level) |
+| `merge_access_level` | string | no | Access levels allowed to merge (defaults: `40`, maintainer access level) |
Example response:
diff --git a/doc/user/index.md b/doc/user/index.md
index a50e5e8fbf8..640edab6ea4 100644
--- a/doc/user/index.md
+++ b/doc/user/index.md
@@ -110,7 +110,7 @@ personal access tokens, authorized applications, etc.
- [Authentication](../topics/authentication/index.md): Read through the authentication
methods available in GitLab.
- [Permissions](permissions.md): Learn the different set of permissions levels for each
-user type (guest, reporter, developer, master, owner).
+user type (guest, reporter, developer, maintainer, owner).
- [Feature highlight](feature_highlight.md): Learn more about the little blue dots
around the app that explain certain features
diff --git a/doc/user/permissions.md b/doc/user/permissions.md
index 5928b378cec..16c19855136 100644
--- a/doc/user/permissions.md
+++ b/doc/user/permissions.md
@@ -200,7 +200,7 @@ GitLab CI/CD permissions rely on the role the user has in GitLab. There are four
permission levels in total:
- admin
-- master
+- maintainer
- developer
- guest/reporter
diff --git a/doc/user/project/clusters/index.md b/doc/user/project/clusters/index.md
index 43a55c123d1..fd3b988fd4e 100644
--- a/doc/user/project/clusters/index.md
+++ b/doc/user/project/clusters/index.md
@@ -382,7 +382,7 @@ you will need the Kubernetes project integration enabled.
### Web terminals
NOTE: **Note:**
-Introduced in GitLab 8.15. You must be the project owner or have `master` permissions
+Introduced in GitLab 8.15. You must be the project owner or have `maintainer` permissions
to use terminals. Support is limited to the first container in the
first pod of your environment.
diff --git a/doc/user/project/integrations/index.md b/doc/user/project/integrations/index.md
index e384ed57de9..363e994f36d 100644
--- a/doc/user/project/integrations/index.md
+++ b/doc/user/project/integrations/index.md
@@ -2,7 +2,7 @@
You can find the available integrations under your project's
**Settings ➔ Integrations** page. You need to have at least
-[master permission][permissions] on the project.
+[maintainer permission][permissions] on the project.
## Project services
diff --git a/doc/user/project/settings/import_export.md b/doc/user/project/settings/import_export.md
index b8bac01959e..9034a9b5179 100644
--- a/doc/user/project/settings/import_export.md
+++ b/doc/user/project/settings/import_export.md
@@ -19,7 +19,7 @@
> - The exports are stored in a temporary [shared directory][tmp] and are deleted
> every 24 hours by a specific worker.
> - Group members will get exported as project members, as long as the user has
-> master or admin access to the group where the exported project lives. An admin
+> maintainer or admin access to the group where the exported project lives. An admin
> in the import side is required to map the users, based on email or username.
> Otherwise, a supplementary comment is left to mention the original author and
> the MRs, notes or issues will be owned by the importer.
diff --git a/doc/workflow/lfs/manage_large_binaries_with_git_lfs.md b/doc/workflow/lfs/manage_large_binaries_with_git_lfs.md
index 0d592a6d43e..ae161e43233 100644
--- a/doc/workflow/lfs/manage_large_binaries_with_git_lfs.md
+++ b/doc/workflow/lfs/manage_large_binaries_with_git_lfs.md
@@ -144,7 +144,7 @@ git lfs unlock --id=123
```
If for some reason you need to unlock a file that was not locked by you,
-you can use the `--force` flag as long as you have a `master` access on
+you can use the `--force` flag as long as you have a `maintainer` access on
the project:
```bash