From 6da85cfff30d30c1e45023000e92c6ff93b33692 Mon Sep 17 00:00:00 2001
From: Jon Glassman <jglassman@gitlab.com>
Date: Tue, 16 Jan 2024 11:57:14 +0000
Subject: [PATCH] Replace abilities with permissions
---
doc/user/custom_roles.md | 4 ++--
doc/user/custom_roles/abilities.md | 8 ++++----
.../custom_roles/docs/templates/custom_abilities.md.erb | 8 ++++----
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/doc/user/custom_roles.md b/doc/user/custom_roles.md
index 07e14494adad..31f647a0afe2 100644
--- a/doc/user/custom_roles.md
+++ b/doc/user/custom_roles.md
@@ -22,7 +22,7 @@ You can discuss individual custom role and permission requests in [issue 391760]
## Available permissions
-For more information on available permissions, see [custom abilities](custom_roles/abilities.md).
+For more information on available permissions, see [custom permissions](custom_roles/abilities.md).
## Create a custom role
@@ -41,7 +41,7 @@ You create a custom role by selecting [permissions](#available-permissions) to a
to a base role.
You can select any number of permissions. For example, you can create a custom role
-with the ability to:
+with the permission to:
- View vulnerability reports.
- Change the status of vulnerabilities.
diff --git a/doc/user/custom_roles/abilities.md b/doc/user/custom_roles/abilities.md
index d117a495798b..924275ae6ab6 100644
--- a/doc/user/custom_roles/abilities.md
+++ b/doc/user/custom_roles/abilities.md
@@ -14,14 +14,14 @@ info: "To determine the technical writer assigned to the Stage/Group associated
edit `tooling/custom_roles/docs/templates/custom_abilities.md.erb`.
--->
-# Available custom abilities
+# Available custom permissions
-The following abilities are available. You can add these abilities in any combination
+The following permissions are available. You can add these permissions in any combination
to a base role to create a custom role.
-Some abilities require having other abilities enabled first. For example, administration of vulnerabilities (`admin_vulnerability`) can only be enabled if reading vulnerabilities (`read_vulnerability`) is also enabled.
+Some permissions require having other permissions enabled first. For example, administration of vulnerabilities (`admin_vulnerability`) can only be enabled if reading vulnerabilities (`read_vulnerability`) is also enabled.
-These requirements are documented in the `Required ability` column in the following table.
+These requirements are documented in the `Required permission` column in the following table.
## Code review workflow
diff --git a/tooling/custom_roles/docs/templates/custom_abilities.md.erb b/tooling/custom_roles/docs/templates/custom_abilities.md.erb
index b6175d0d44fc..9d29cf3333fa 100644
--- a/tooling/custom_roles/docs/templates/custom_abilities.md.erb
+++ b/tooling/custom_roles/docs/templates/custom_abilities.md.erb
@@ -34,14 +34,14 @@ info: "To determine the technical writer assigned to the Stage/Group associated
edit `tooling/custom_roles/docs/templates/custom_abilities.md.erb`.
--->
-# Available custom abilities
+# Available custom permissions
-The following abilities are available. You can add these abilities in any combination
+The following permissions are available. You can add these permissions in any combination
to a base role to create a custom role.
-Some abilities require having other abilities enabled first. For example, administration of vulnerabilities (`admin_vulnerability`) can only be enabled if reading vulnerabilities (`read_vulnerability`) is also enabled.
+Some permissions require having other permissions enabled first. For example, administration of vulnerabilities (`admin_vulnerability`) can only be enabled if reading vulnerabilities (`read_vulnerability`) is also enabled.
-These requirements are documented in the `Required ability` column in the following table.
+These requirements are documented in the `Required permission` column in the following table.
<% custom_abilities_by_feature_category.sort.each do |category, abilities| %>
## <%= "#{humanize(category)}" %>
--
GitLab