diff --git a/app/views/admin/users/_access_levels.html.haml b/app/views/admin/users/_access_levels.html.haml index 5977de7c84c6f14c22371cd43f4b10a09c076046..1e4c3f3bb62f24761d5b762ea9f923868e2ee22f 100644 --- a/app/views/admin/users/_access_levels.html.haml +++ b/app/views/admin/users/_access_levels.html.haml @@ -26,10 +26,10 @@ = render_if_exists 'admin/users/auditor_access_level_radio', f: f, disabled: editing_current_user - - help_text = s_('AdminUsers|Administrators have access to all groups, projects and users and can manage all features in this installation.') - - help_text += ' ' + s_('AdminUsers|You cannot remove your own admin rights.') if editing_current_user + - help_text = s_('AdminUsers|The user has unlimited access to all groups, projects, users, and features.') + - help_text += ' ' + s_('AdminUsers|You cannot remove your own administrator access.') if editing_current_user = f.gitlab_ui_radio_component :access_level, :admin, - s_('AdminUsers|Admin'), + s_('AdminUsers|Administrator'), radio_options: { disabled: editing_current_user }, help_text: help_text diff --git a/doc/.vale/gitlab/SubstitutionWarning.yml b/doc/.vale/gitlab/SubstitutionWarning.yml index 8000328a20cc60d0dada11fcff68b5629f6b7c6d..7ee32e41ade4df6cacbdb23646cba85fe101640b 100644 --- a/doc/.vale/gitlab/SubstitutionWarning.yml +++ b/doc/.vale/gitlab/SubstitutionWarning.yml @@ -22,6 +22,3 @@ swap: repo: repository timezone: time zone utilize: use - administrator permission: the administrator access level - administrator permissions: the administrator access level - administrator role: the administrator access level diff --git a/doc/.vale/gitlab/Substitutions.yml b/doc/.vale/gitlab/Substitutions.yml index dde05b993ec93a3ddc3f7f74b9c59781ae7b05ac..1cc5a60ac91ff1eb8562b15417221bb0b6902127 100644 --- a/doc/.vale/gitlab/Substitutions.yml +++ b/doc/.vale/gitlab/Substitutions.yml @@ -38,6 +38,12 @@ swap: can sign-in: can sign in x509: X.509 yaml: YAML + admin user: administrator + admin users: administrators + administrator permission: administrator access + administrator permissions: administrator access + administrator role: administrator access + the administrator access level: administrator access developer access: the Developer role developer permission: the Developer role developer permissions: the Developer role diff --git a/doc/administration/auditor_users.md b/doc/administration/auditor_users.md index 5498ea9d4be1da901b0e784c332f32757214873f..12e222290e7ec9e8e352fb5e75adfa781945324f 100644 --- a/doc/administration/auditor_users.md +++ b/doc/administration/auditor_users.md @@ -64,7 +64,7 @@ To create an Auditor user: 1. Select **Create user** or **Save changes** if you created a new user or edited an existing one respectively. -To revoke Auditor permissions from a user, make them a regular user by +To revoke Auditor permissions from a user, make them a Regular user by following the previous steps. Additionally users can be set as an Auditor using [SAML groups](../integration/saml.md#auditor-groups). diff --git a/doc/administration/auth/ldap/ldap-troubleshooting.md b/doc/administration/auth/ldap/ldap-troubleshooting.md index 79771dfd2c4a0ae0a61a3b68f9bdf8417aac780c..06fe579e1018ab193c1dc3e656b6f5f4842ac10a 100644 --- a/doc/administration/auth/ldap/ldap-troubleshooting.md +++ b/doc/administration/auth/ldap/ldap-troubleshooting.md @@ -382,7 +382,7 @@ the following are true: - The configured `admin_group` in the `gitlab.rb` is a CN, rather than a DN or an array. - This CN falls under the scope of the configured `group_base`. - The members of the `admin_group` have already signed into GitLab with their LDAP - credentials. GitLab only grants the Administrator role to the users whose + credentials. GitLab only grants administrator access to the users whose accounts are already connected to LDAP. If all the above are true and the users are still not getting access, diff --git a/doc/administration/monitoring/performance/performance_bar.md b/doc/administration/monitoring/performance/performance_bar.md index 59237a83e4de3ef57848ca77034ee0a75f345d7e..e93dbd3a2d6ab73e96bbf1e8d728e619af43f86f 100644 --- a/doc/administration/monitoring/performance/performance_bar.md +++ b/doc/administration/monitoring/performance/performance_bar.md @@ -108,7 +108,7 @@ appears next to requests with warnings. The performance bar is disabled by default for non-administrators. To enable it for a given group: -1. Sign in as a user with Administrator [role](../../../user/permissions.md). +1. Sign in as a user with administrator access. 1. On the top bar, select **Menu > Admin**. 1. On the left sidebar, select **Settings > Metrics and profiling** (`admin/application_settings/metrics_and_profiling`), and expand diff --git a/doc/administration/monitoring/prometheus/gitlab_metrics.md b/doc/administration/monitoring/prometheus/gitlab_metrics.md index 5f18c981c735b884b2cdca101c8193d93ab0ebef..ced0ff310d0b7e2b8fb87c559e2bea34e28ea9aa 100644 --- a/doc/administration/monitoring/prometheus/gitlab_metrics.md +++ b/doc/administration/monitoring/prometheus/gitlab_metrics.md @@ -8,7 +8,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w To enable the GitLab Prometheus metrics: -1. Log in to GitLab as a user with Administrator [role](../../../user/permissions.md). +1. Log in to GitLab as a user with administrator access. 1. On the top bar, select **Menu > Admin**. 1. On the left sidebar, select **Settings > Metrics and profiling**. 1. Find the **Metrics - Prometheus** section, and select **Add link to Prometheus**. diff --git a/doc/administration/troubleshooting/gitlab_rails_cheat_sheet.md b/doc/administration/troubleshooting/gitlab_rails_cheat_sheet.md index 3680c54f9eb5e2b7d413a7ca6b6e05d5e9284c7c..b66214333bff06745814d6811042b44399602bff 100644 --- a/doc/administration/troubleshooting/gitlab_rails_cheat_sheet.md +++ b/doc/administration/troubleshooting/gitlab_rails_cheat_sheet.md @@ -1332,7 +1332,7 @@ cluster = Clusters::Cluster.find_by(name: 'cluster_name') Delete cluster without associated resources: ```ruby -# Find users with the Administrator role +# Find users with the administrator access user = User.find_by(username: 'admin_user') # Find the cluster with the ID diff --git a/doc/api/deploy_keys.md b/doc/api/deploy_keys.md index b244384bd6a4d4ed1b980b93b711de6c02dcb809..ee6887e9d04771c2b54485a3bec93530a61e0acf 100644 --- a/doc/api/deploy_keys.md +++ b/doc/api/deploy_keys.md @@ -9,7 +9,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w ## List all deploy keys **(FREE SELF)** Get a list of all deploy keys across all projects of the GitLab instance. This -endpoint requires an administrator role and is not available on GitLab.com. +endpoint requires administrator access and is not available on GitLab.com. ```plaintext GET /deploy_keys diff --git a/doc/api/deploy_tokens.md b/doc/api/deploy_tokens.md index badaa7f106583edaf3bd3ae401214e2d4b3153f5..77c2fe5e1627e4855c8234fcd8faadaf18ee65b5 100644 --- a/doc/api/deploy_tokens.md +++ b/doc/api/deploy_tokens.md @@ -10,7 +10,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/21811) in GitLab 12.9. -Get a list of all deploy tokens across the GitLab instance. This endpoint requires the Administrator role. +Get a list of all deploy tokens across the GitLab instance. This endpoint requires administrator access. ```plaintext GET /deploy_tokens diff --git a/doc/api/groups.md b/doc/api/groups.md index 764622a91ece00f6c9f2218b44948691d6995404..bd947e6685c1e14c61194ec0181b19f832947d79 100644 --- a/doc/api/groups.md +++ b/doc/api/groups.md @@ -832,7 +832,8 @@ curl --request POST --header "PRIVATE-TOKEN: <your_access_token>" \ ## Transfer project to group -Transfer a project to the Group namespace. Available only to instance administrators, although an [alternative API endpoint](projects.md#transfer-a-project-to-a-new-namespace) is available which does not require instance administrator role. Transferring projects may fail when tagged packages exist in the project's repository. +Transfer a project to the Group namespace. Available only to instance administrators, although an [alternative API endpoint](projects.md#transfer-a-project-to-a-new-namespace) +is available which does not require administrator access on the instance. Transferring projects may fail when tagged packages exist in the project's repository. ```plaintext POST /groups/:id/projects/:project_id diff --git a/doc/api/instance_clusters.md b/doc/api/instance_clusters.md index f29ac5cd7f2ebbbed739291ccbb1c512c34d8fd2..ab631757eab92749c1aaefe281b9896c588781b2 100644 --- a/doc/api/instance_clusters.md +++ b/doc/api/instance_clusters.md @@ -16,8 +16,7 @@ With [instance-level Kubernetes clusters](../user/instance/clusters/index.md), you can connect a Kubernetes cluster to the GitLab instance and use the same cluster across all of the projects within your instance. -NOTE: -Users need the Administrator role to use these endpoints. +Users need administrator access to use these endpoints. ## List instance clusters diff --git a/doc/api/pages.md b/doc/api/pages.md index a115f0b0a0f713aeb4c39ba3390f5d7c197b09a4..7316d225dbcb3e6d6b7c839b273f23790e232c9f 100644 --- a/doc/api/pages.md +++ b/doc/api/pages.md @@ -12,7 +12,7 @@ The GitLab Pages feature must be enabled to use these endpoints. Find out more a ## Unpublish pages -Remove pages. The user must have the Administrator role. +Remove pages. The user must have administrator access. ```plaintext DELETE /projects/:id/pages diff --git a/doc/api/pages_domains.md b/doc/api/pages_domains.md index 624bdf29e5d8b1d2c1cc6baed4ab980a9ad3a8f0..c1f81ffa3617342f91bd3463a22197e706db1133 100644 --- a/doc/api/pages_domains.md +++ b/doc/api/pages_domains.md @@ -12,7 +12,7 @@ The GitLab Pages feature must be enabled to use these endpoints. Find out more a ## List all Pages domains -Get a list of all Pages domains. The user must have the administrator role. +Get a list of all Pages domains. The user must have administrator access. ```plaintext GET /pages/domains diff --git a/doc/api/plan_limits.md b/doc/api/plan_limits.md index d6eccbe0141b684eedb1f75b5e8c3803643e5a5d..75c8d241513d6a6c9a4afc37c251b0ca23a70bb0 100644 --- a/doc/api/plan_limits.md +++ b/doc/api/plan_limits.md @@ -13,8 +13,7 @@ The plan limits API allows you to maintain the application limits for the existi The existing plans depend on the GitLab edition. In the Community Edition, only the plan `default` is available. In the Enterprise Edition, additional plans are available as well. -NOTE: -The Administrator role is required to use this API. +Administrator access is required to use this API. ## Get current plan limits diff --git a/doc/api/project_snippets.md b/doc/api/project_snippets.md index d67db14ec11e6acc02e96d40f1f5a37f3a66230d..efbd8bf9431779f13ca236a061cb9be87975c8e5 100644 --- a/doc/api/project_snippets.md +++ b/doc/api/project_snippets.md @@ -246,7 +246,7 @@ curl "https://gitlab.com/api/v4/projects/1/snippets/2/files/master/snippet%2Erb/ ## Get user agent details -Available only for users with the Administrator role. +Available only for users with administrator access. ```plaintext GET /projects/:id/snippets/:snippet_id/user_agent_detail diff --git a/doc/api/runners.md b/doc/api/runners.md index 3cccb86194a6a6e7c5c4c3ee7cfa7f177f2e9fcc..968e24109f204e36a14c7cbf5e3cc57cf24d9614 100644 --- a/doc/api/runners.md +++ b/doc/api/runners.md @@ -98,7 +98,7 @@ Example response: ## List all runners **(FREE SELF)** Get a list of all runners in the GitLab instance (specific and shared). Access -is restricted to users with the administrator role. +is restricted to users with administrator access. ```plaintext GET /runners/all diff --git a/doc/api/users.md b/doc/api/users.md index 6ffaaab9f84b24528daa2f03cb303f66468ef349..c869e17c8c62ba4bd62aff228f05205514dbcb5d 100644 --- a/doc/api/users.md +++ b/doc/api/users.md @@ -109,7 +109,7 @@ GET /users | `sort` | string | no | Return users sorted in `asc` or `desc` order. Default is `desc` | | `two_factor` | string | no | Filter users by Two-factor authentication. Filter values are `enabled` or `disabled`. By default it returns all users | | `without_projects` | boolean | no | Filter users without projects. Default is `false`, which means that all users are returned, with and without projects. | -| `admins` | boolean | no | Return only admin users. Default is `false` | +| `admins` | boolean | no | Return only administrators. Default is `false` | | `saml_provider_id` **(PREMIUM)** | number | no | Return only users created by the specified SAML provider ID. If not included, it returns all users. | ```json @@ -1546,7 +1546,7 @@ Please refer to the [Events API documentation](events.md#get-user-contribution-e ## Get all impersonation tokens of a user -> Requires administrator permissions. +Requires administrator access. It retrieves every impersonation token of the user. Use the pagination parameters `page` and `per_page` to restrict the list of impersonation tokens. @@ -1720,8 +1720,8 @@ Example response: ## Create an impersonation token -> Requires administrator permissions. -> Token values are returned once. Make sure you save it - you can't access it again. +Requires administrator access. Token values are returned once. Make sure you save it because you can't access +it again. It creates a new impersonation token. Only administrators can do this. You are only able to create impersonation tokens to impersonate the user and perform @@ -1765,7 +1765,7 @@ Example response: ## Revoke an impersonation token -> Requires administrator permissions. +Requires administrator access. It revokes an impersonation token. diff --git a/doc/ci/pipelines/job_artifacts.md b/doc/ci/pipelines/job_artifacts.md index 7679bf88330f28bfe64cb73f828e1240b0c3f4a9..8afe6243460cfff1cdf58cf49bfa998f8095bb0b 100644 --- a/doc/ci/pipelines/job_artifacts.md +++ b/doc/ci/pipelines/job_artifacts.md @@ -260,7 +260,7 @@ You can delete a single job, which also removes the job's artifacts and log. You must be: - The owner of the job. -- A Maintainer of the project. +- A user with at least the Maintainer role for the project. To delete a job: diff --git a/doc/ci/services/index.md b/doc/ci/services/index.md index 51df8c102f7d588494069038183b594960705260..74fcb24ac4e03f626e6236704407c25617c2426b 100644 --- a/doc/ci/services/index.md +++ b/doc/ci/services/index.md @@ -387,7 +387,7 @@ time. ## Debug a job locally The following commands are run without root privileges. You should be -able to run Docker with your regular user account. +able to run Docker with your user account. First start with creating a file named `build_script`: diff --git a/doc/ci/variables/index.md b/doc/ci/variables/index.md index d588c4fe61f3366c3e4a37a330bfc68ccab577dc..b8dea3af441a9e77e0a964e1f8b23d30738adeac 100644 --- a/doc/ci/variables/index.md +++ b/doc/ci/variables/index.md @@ -233,7 +233,7 @@ inherited. > - [Feature flag removed](https://gitlab.com/gitlab-org/gitlab/-/issues/299879) in GitLab 13.11. To make a CI/CD variable available to all projects and groups in a GitLab instance, -add an instance CI/CD variable. You must have the Administrator access level. +add an instance CI/CD variable. You must have administrator access. You can define instance variables via the UI or [API](../../api/instance_level_ci_variables.md). diff --git a/doc/development/documentation/styleguide/word_list.md b/doc/development/documentation/styleguide/word_list.md index 5fdc8404ed820a001dec2b4bebd52cdaf2594f6b..e754066fa3c2ad7832d16492a8a2eff36ed43289 100644 --- a/doc/development/documentation/styleguide/word_list.md +++ b/doc/development/documentation/styleguide/word_list.md @@ -58,11 +58,7 @@ Capitalize these words when you refer to the UI. Otherwise use lowercase. ## administrator -Use **administrator** instead of **admin** when talking about a user's access level. -Use lowercase unless you are referring to the **Admin** access level you select in the UI. - -To view the administrator access level, in the GitLab UI, go to the Admin Area and select -**Users**. Then select **New user**. +Use **administrator access** instead of **admin** when talking about a user's access level.  @@ -71,7 +67,7 @@ An **administrator** is not a [role](#roles) or [permission](#permissions). Use: - To do this thing, you must be an administrator. -- To do this thing, you must have the administrator access level. +- To do this thing, you must have administrator access. Instead of: diff --git a/doc/development/scalability.md b/doc/development/scalability.md index 7a3f3c7097d5a86974a01fca43d4ba1b0e4e7e09..fe7063be0e85976736a74824e723be167a35c5ce 100644 --- a/doc/development/scalability.md +++ b/doc/development/scalability.md @@ -45,7 +45,7 @@ many groups or projects, and the access level (including guest, developer, or maintainer) to groups and projects determines what users can see and what they can access. -Users with the administrator role can access all projects and even impersonate +Users with administrator access can access all projects and even impersonate users. #### Sharding and partitioning diff --git a/doc/development/service_ping/index.md b/doc/development/service_ping/index.md index c9fd51addd04fc75cb06b7cab6856bd7b441e6ff..9786b1a8347a267b37fc339fbf39d353754c0550 100644 --- a/doc/development/service_ping/index.md +++ b/doc/development/service_ping/index.md @@ -84,7 +84,7 @@ Registration is not yet required for participation, but will be added in a futur #### Enable Registration Features -1. Sign in as a user with the [Administrator](../../user/permissions.md) role. +1. Sign in as a user with administrator access. 1. On the top bar, select **Menu > Admin**. 1. On the left sidebar, select **Settings > Metrics and profiling**. 1. Expand the **Usage statistics** section. @@ -96,7 +96,7 @@ Registration is not yet required for participation, but will be added in a futur You can view the exact JSON payload sent to GitLab Inc. in the Admin Area. To view the payload: -1. Sign in as a user with the [Administrator](../../user/permissions.md) role. +1. Sign in as a user with administrator access. 1. On the top bar, select **Menu > Admin**. 1. On the left sidebar, select **Settings > Metrics and profiling**. 1. Expand the **Usage statistics** section. @@ -118,7 +118,7 @@ configuration file. To disable Service Ping in the GitLab UI: -1. Sign in as a user with the [Administrator](../../user/permissions.md) role. +1. Sign in as a user with administrator access. 1. On the top bar, select **Menu > Admin**. 1. On the left sidebar, select **Settings > Metrics and profiling**. 1. Expand the **Usage statistics** section. diff --git a/doc/development/testing_guide/end_to_end/best_practices.md b/doc/development/testing_guide/end_to_end/best_practices.md index 543feaa967c62e87f3848f34b63f883f67075de9..405ff40ef6a7dde429ecbca7a7de5b752d31fb19 100644 --- a/doc/development/testing_guide/end_to_end/best_practices.md +++ b/doc/development/testing_guide/end_to_end/best_practices.md @@ -363,11 +363,11 @@ after(:all) do end ``` -## Tag tests that require the Administrator role +## Tag tests that require administrator access -We don't run tests that require the Administrator role against our Production environments. +We don't run tests that require administrator access against our Production environments. -When you add a new test that requires the Administrator role, apply the RSpec metadata `:requires_admin` so that the test will not be included in the test suites executed against Production and other environments on which we don't want to run those tests. +When you add a new test that requires administrator access, apply the RSpec metadata `:requires_admin` so that the test will not be included in the test suites executed against Production and other environments on which we don't want to run those tests. When running tests locally or configuring a pipeline, the environment variable `QA_CAN_TEST_ADMIN_FEATURES` can be set to `false` to skip tests that have the `:requires_admin` tag. diff --git a/doc/integration/datadog.md b/doc/integration/datadog.md index 4873826a67d6fc1b4b3bf1232836dcb1fb16aae8..7f74786314f07c1575bd57fa3156e8b02d9314cc 100644 --- a/doc/integration/datadog.md +++ b/doc/integration/datadog.md @@ -26,7 +26,7 @@ project, group, or instance level: Copy this value, as you need it in a later step. 1. *For project-level or group-level integrations:* In GitLab, go to your project or group. 1. *For instance-level integrations:* - 1. Sign in to GitLab as a user with the Administrator access level. + 1. Sign in to GitLab as a user with administrator access. 1. On the top bar, select **Menu > Admin**. 1. On the left sidebar, select **Settings > Integrations**. 1. Scroll to **Add an integration**, and select **Datadog**. diff --git a/doc/integration/jenkins.md b/doc/integration/jenkins.md index bae526229661fd3191458313489bca4e50543e9e..7ff8ce7ee73c6270fe1bc361d06ec6aa3772d087 100644 --- a/doc/integration/jenkins.md +++ b/doc/integration/jenkins.md @@ -44,7 +44,7 @@ Grant a GitLab user access to the relevant GitLab projects. 1. Grant the user permission to the GitLab projects. If you're integrating Jenkins with many GitLab projects, consider granting the - user the administrator access level. Otherwise, add the user to each project + user administrator access. Otherwise, add the user to each project and grant the Developer role. ## Grant Jenkins access to the GitLab API diff --git a/doc/integration/jira/connect-app.md b/doc/integration/jira/connect-app.md index b59c5a834f3026726243161aadc53c3609f5fd5c..ebe8a0f1af44f2be0fb121c1c3ef0170f6f27046 100644 --- a/doc/integration/jira/connect-app.md +++ b/doc/integration/jira/connect-app.md @@ -10,8 +10,7 @@ You can integrate GitLab and Jira Cloud using the [GitLab.com for Jira Cloud](https://marketplace.atlassian.com/apps/1221011/gitlab-com-for-jira-cloud) app in the Atlassian Marketplace. -NOTE: -Only Jira users with the administrator role can install or configure +Only Jira users with administrator access can install or configure the GitLab.com for Jira Cloud app. ## Install the GitLab.com for Jira Cloud app **(FREE SAAS)** @@ -91,10 +90,10 @@ self-managed GitLab instances with Jira Cloud, you can either: You can configure your Atlassian Cloud instance to allow you to install applications from outside the Marketplace, which allows you to install the application: -1. Sign in to your Jira instance as a user with an Administrator role. +1. Sign in to your Jira instance as an administrator. 1. Place your Jira instance into [development mode](https://developer.atlassian.com/cloud/jira/platform/getting-started-with-connect/#step-2--enable-development-mode). -1. Sign in to your GitLab application as an [administrator](../../user/permissions.md). +1. Sign in to your GitLab application as a user with administrator access. 1. Install the GitLab application from your self-managed GitLab instance, as described in the [Atlassian developer guides](https://developer.atlassian.com/cloud/jira/platform/getting-started-with-connect/#step-3--install-and-test-your-app): 1. In your Jira instance, go to **Apps > Manage Apps** and select **Upload app**: diff --git a/doc/integration/saml.md b/doc/integration/saml.md index 49a7eeb01b2a652d22ecbcae64d6abc6efe3a036..95bf835147df3de7dd0e18a09557a1c8ac139507 100644 --- a/doc/integration/saml.md +++ b/doc/integration/saml.md @@ -367,7 +367,7 @@ The requirements are the same as the previous settings: - The IdP must pass Group information to GitLab. - GitLab must know where to look for the groups in the SAML response, as well as - which group(s) grant the user an administrator role. + which groups grant the user administrator access. ```yaml { name: 'saml', @@ -504,7 +504,7 @@ omniauth: Keep in mind that every sign in attempt redirects to the SAML server; you cannot sign in using local credentials. Ensure at least one of the -SAML users has an administrator role. +SAML users has administrator access. You may also bypass the auto sign-in feature by browsing to `https://gitlab.example.com/users/sign_in?auto_sign_in=false`. diff --git a/doc/tools/email.md b/doc/tools/email.md index 0429b9b952ebaed5299809dba98d3b1132bee601..0a3e37719a4743faac103e6d499ae0f307a6a96d 100644 --- a/doc/tools/email.md +++ b/doc/tools/email.md @@ -26,7 +26,7 @@ For information about email notifications originating from GitLab, read 1. On the left sidebar, select **Overview > Users**. 1. Select **Send email to users**. -  +  1. Compose an email and choose where to send it (all users or users of a chosen group or project). The email body only supports plain text messages. diff --git a/doc/user/admin_area/settings/deprecated_api_rate_limits.md b/doc/user/admin_area/settings/deprecated_api_rate_limits.md index 9be703f3b82b53fb70249f8f2daaf7a19773689a..d651e445a959664a7c9496dec6eed3447871ecd1 100644 --- a/doc/user/admin_area/settings/deprecated_api_rate_limits.md +++ b/doc/user/admin_area/settings/deprecated_api_rate_limits.md @@ -30,7 +30,7 @@ for deprecated API endpoints. No other new features are provided by this overrid Prerequisites: -- You must have the Administrator role for your instance. +- You must have administrator access for your instance. To override the general user and IP rate limits for requests to deprecated API endpoints: diff --git a/doc/user/admin_area/settings/files_api_rate_limits.md b/doc/user/admin_area/settings/files_api_rate_limits.md index 675561ce9cf59423721ff740d06d62379fa74fa0..8f8d8c1609b566e602a7afe3a20fc5f6314875be 100644 --- a/doc/user/admin_area/settings/files_api_rate_limits.md +++ b/doc/user/admin_area/settings/files_api_rate_limits.md @@ -26,7 +26,7 @@ for the Files API. No other new features are provided by this override. Prerequisite: -- You must have the Administrator role for your instance. +- You must have administrator access for your instance. To override the general user and IP rate limits for requests to the Repository files API: diff --git a/doc/user/admin_area/settings/sign_in_restrictions.md b/doc/user/admin_area/settings/sign_in_restrictions.md index 52b20d5b437997683e900c4aec34abc2de9e15a9..c63cd88eeb452008c63f44f5b9e1786a91a9b8b8 100644 --- a/doc/user/admin_area/settings/sign_in_restrictions.md +++ b/doc/user/admin_area/settings/sign_in_restrictions.md @@ -38,7 +38,7 @@ they do not have access to all projects, groups, or the **Admin Area** menu. To access potentially dangerous resources, an administrator can activate Admin Mode by: - Selecting the *Enable Admin Mode* button -- Trying to access any part of the UI that requires an administrator role, specifically those which call `/admin` endpoints. +- Trying to access any part of the UI that requires administrator access, specifically those which call `/admin` endpoints. The main use case allows administrators to perform their regular tasks as a regular user, based on their memberships, without having to set up a second account for diff --git a/doc/user/admin_area/settings/visibility_and_access_controls.md b/doc/user/admin_area/settings/visibility_and_access_controls.md index bc0a6f9af97198a4192a5b9341f95ff3549c4c72..a6f7eccffe42dd5fa270c5b6be935d1b1d8e14e6 100644 --- a/doc/user/admin_area/settings/visibility_and_access_controls.md +++ b/doc/user/admin_area/settings/visibility_and_access_controls.md @@ -7,7 +7,7 @@ type: reference # Control access and visibility **(FREE SELF)** -GitLab enables users with the Administrator access level to enforce +GitLab enables users with administrator access to enforce specific controls on branches, projects, snippets, groups, and more. To access the visibility and access control options: @@ -84,7 +84,7 @@ on the instance. To alter which roles have permission to create projects: ## Restrict project deletion to Administrators **(PREMIUM SELF)** Anyone with the **Owner** role, either at the project or group level, can -delete a project. To allow only users with the Administrator role to delete projects: +delete a project. To allow only users with administrator access to delete projects: 1. Sign in to GitLab as a user with Administrator access level. 1. On the top bar, select **Menu > Admin**. diff --git a/doc/user/infrastructure/iac/terraform_state.md b/doc/user/infrastructure/iac/terraform_state.md index d386cd93ae41ecb5de9abaa92999ffacb0b0c660..0c5c09e8ace304ca6bede2ac0755be383c441a4b 100644 --- a/doc/user/infrastructure/iac/terraform_state.md +++ b/doc/user/infrastructure/iac/terraform_state.md @@ -33,10 +33,10 @@ before using this feature. ## Permissions for using Terraform -In GitLab version 13.1, the Maintainer role was required to use a +In GitLab version 13.1, at least the Maintainer role was required to use a GitLab managed Terraform state backend. -In GitLab versions 13.2 and later: +In GitLab versions 13.2 and later, at least: - The Maintainer role is required to lock, unlock, and write to the state (using `terraform apply`). - The Developer role is required to read the state (using `terraform plan -lock=false`). diff --git a/doc/user/packages/container_registry/index.md b/doc/user/packages/container_registry/index.md index fa4250fc5fd2a152838b7823dafc028acd3bcb31..b28f0cbfb35152611656950f6d1f522c8db81db6 100644 --- a/doc/user/packages/container_registry/index.md +++ b/doc/user/packages/container_registry/index.md @@ -603,7 +603,7 @@ You can then tag the manifest list with `mygroup/myapp:1.0.0`. ### Troubleshoot as a GitLab server administrator Troubleshooting the GitLab Container Registry, most of the times, requires -you to log in to GitLab server with the Administrator role. +you to log in to GitLab server with administrator access. [Read how to troubleshoot the Container Registry](../../../administration/packages/container_registry.md#troubleshooting). diff --git a/doc/user/project/import/github.md b/doc/user/project/import/github.md index d4cca72333331665a448662f4de88ec316b148fb..ce105f3b29d3ad88832616c2779e50bab741d327 100644 --- a/doc/user/project/import/github.md +++ b/doc/user/project/import/github.md @@ -181,8 +181,7 @@ Mirroring does not sync any new or updated pull requests from your GitHub projec ## Improve the speed of imports on self-managed instances -NOTE: -An administrator role on the GitLab server is required for this process. +Administrator access on the GitLab server is required for this process. For large projects it may take a while to import all data. To reduce the time necessary, you can increase the number of Sidekiq workers that process the following queues: diff --git a/doc/user/project/import/index.md b/doc/user/project/import/index.md index 001f0d56cc510f3ea22be1c1ce74738d04608d70..41ef15108eccec8b2d6b8c2a7d03541231d304a6 100644 --- a/doc/user/project/import/index.md +++ b/doc/user/project/import/index.md @@ -50,7 +50,7 @@ information, see the prerequisites and important notes in these sections: NOTE: When migrating to GitLab.com, you must create users manually unless [SCIM](../../../user/group/saml_sso/scim_setup.md) will be used. Creating users with the API is limited to self-managed instances as it requires -the Administrator role. +administrator access. To migrate all data from self-managed to GitLab.com, you can leverage the [API](../../../api/index.md). Migrate the assets in this order: diff --git a/doc/user/project/integrations/mattermost_slash_commands.md b/doc/user/project/integrations/mattermost_slash_commands.md index b47c9f65c45daf6d5a5327a7b508ed450e2fb861..b317e65bdf24389fc07be1adb1f93cb83258ff88 100644 --- a/doc/user/project/integrations/mattermost_slash_commands.md +++ b/doc/user/project/integrations/mattermost_slash_commands.md @@ -67,7 +67,7 @@ After you enable custom slash commands in Mattermost, you need configuration information from GitLab. To get this information: 1. In a different browser tab than your current Mattermost session, sign in to - GitLab as a user with the administrator access level. + GitLab as a user with administrator access. 1. On the top bar, select **Menu > Admin**. 1. In the left menu, select **Settings > Integrations**, then select **Mattermost slash commands**. diff --git a/doc/user/project/issues/managing_issues.md b/doc/user/project/issues/managing_issues.md index 83f6cae4f131ecb887f9cce74a6f937c0ff48377..39b59d5e7ebde33d6f5938dbd81e0d1aaa9e119b 100644 --- a/doc/user/project/issues/managing_issues.md +++ b/doc/user/project/issues/managing_issues.md @@ -468,7 +468,7 @@ Merge requests in other projects can still close another project's issues. Prerequisites: -- You must have the [administrator access level](../../../administration/index.md) for your GitLab instance. +- You must have [administrator access](../../../administration/index.md) to your GitLab instance. To change the default issue closing pattern, edit the [`gitlab.rb` or `gitlab.yml` file](../../../administration/issue_closing_pattern.md) diff --git a/doc/user/project/pages/index.md b/doc/user/project/pages/index.md index 283ed0b61b945c21cbe6fcf3f6415c0f45c8cc54..82b1a824f7a1cab50b1973dbc5add74af367ef9f 100644 --- a/doc/user/project/pages/index.md +++ b/doc/user/project/pages/index.md @@ -81,7 +81,7 @@ GitLab Pages website. You can either use the GitLab [default domain for GitLab Pages websites](getting_started_part_one.md#gitlab-pages-default-domain-names), `*.gitlab.io`, or your own domain (`example.com`). In that case, you -must have the Administrator role in your domain's registrar (or control panel) to set it up with Pages. +must be an administrator in your domain's registrar (or control panel) to set it up with Pages. The following diagrams show the workflows you might follow to get started with Pages. diff --git a/doc/user/project/protected_branches.md b/doc/user/project/protected_branches.md index 6ff9e66eb8d4acc3037b58ac59cc2ff3a03a6d18..88293406179fb365d9570d555a521e3a3bd01443 100644 --- a/doc/user/project/protected_branches.md +++ b/doc/user/project/protected_branches.md @@ -217,7 +217,7 @@ for details about the pipelines security model. ## Delete a protected branch -Users with at least the Maintainer can manually delete protected +Users with at least the Maintainer role can manually delete protected branches by using the GitLab web interface: 1. Go to **Repository > Branches**. diff --git a/doc/user/project/settings/index.md b/doc/user/project/settings/index.md index dda788f3d130c2df741d627527d6ce0d9785b3c7..3f30b010ff7e440e2366271a1bdb08ce6568cf88 100644 --- a/doc/user/project/settings/index.md +++ b/doc/user/project/settings/index.md @@ -360,7 +360,7 @@ available in project listings. Only project owners and administrators have the To find an archived project: -1. Sign in to GitLab as the project owner or a user with the Administrator role. +1. Sign in to GitLab as the project owner or a user with administrator access. 1. If you: - Have the project's URL, open the project's page in your browser. - Don't have the project's URL: diff --git a/doc/user/upgrade_email_bypass.md b/doc/user/upgrade_email_bypass.md index 3272ff30e723e29179cebe8bf042a15626e9c75c..8cd9a47f3e6eda957150ac91812123ba768e68df 100644 --- a/doc/user/upgrade_email_bypass.md +++ b/doc/user/upgrade_email_bypass.md @@ -58,7 +58,7 @@ User.where(confirmed_at: nil).where('LENGTH(confirmation_token) = 32') ## What does it look like when a user is blocked? -A regular user might receive a message that says "You have to confirm your email address before continuing". This message could includes a 404 or 422 error code, when the user tries to sign in. +A user might receive a message that says "You have to confirm your email address before continuing". This message could includes a 404 or 422 error code, when the user tries to sign in. NOTE: We hope to improve the [sign-in experience for an unverified user](https://gitlab.com/gitlab-org/gitlab/-/issues/29279) in a future release. diff --git a/locale/gitlab.pot b/locale/gitlab.pot index fb3e67e8dc3d1b71993efffcad788ef70436efbc..85fa42008f3e531754a964147077ba9afa74a5ee 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -2693,7 +2693,7 @@ msgstr "" msgid "AdminUsers|Admin" msgstr "" -msgid "AdminUsers|Administrators have access to all groups, projects and users and can manage all features in this installation." +msgid "AdminUsers|Administrator" msgstr "" msgid "AdminUsers|Admins" @@ -2885,6 +2885,9 @@ msgstr "" msgid "AdminUsers|The user can't log in." msgstr "" +msgid "AdminUsers|The user has unlimited access to all groups, projects, users, and features." +msgstr "" + msgid "AdminUsers|The user will be logged out" msgstr "" @@ -2987,7 +2990,7 @@ msgstr "" msgid "AdminUsers|You can unban their account in the future. Their data remains intact." msgstr "" -msgid "AdminUsers|You cannot remove your own admin rights." +msgid "AdminUsers|You cannot remove your own administrator access." msgstr "" msgid "AdminUsers|You must transfer ownership or delete the groups owned by this user before you can delete their account"