Add latest changes from gitlab-org/gitlab@master

6 files changed, 58 insertions, 40 deletions

diff --git a/doc/ci/pipelines/cicd_minutes.md b/doc/ci/pipelines/cicd_minutes.md
index 8ea42206adb..2528a53088d 100644
--- a/doc/ci/pipelines/cicd_minutes.md
+++ b/doc/ci/pipelines/cicd_minutes.md
@@ -317,6 +317,13 @@ On GitLab SaaS an email notification is sent to the namespace owners when:
 - The available CI/CD minutes are below 5% of the quota.
 - All CI/CD minutes have been used.
 
+### Special quota limits
+
+In some cases, the quota limit is replaced by one of the following labels:
+
+- **Unlimited minutes**: For namespaces with unlimited CI/CD minutes
+- **Not supported minutes**: For namespaces where active shared runners are not enabled
+
 ## Reduce consumption of CI/CD minutes
 
 If your project consumes too many CI/CD minutes, there are some strategies you can
diff --git a/doc/ci/pipelines/merge_request_pipelines.md b/doc/ci/pipelines/merge_request_pipelines.md
index 881e94a6559..d42f35627a2 100644
--- a/doc/ci/pipelines/merge_request_pipelines.md
+++ b/doc/ci/pipelines/merge_request_pipelines.md
@@ -202,16 +202,20 @@ It's possible to have both branch pipelines and merge request pipelines in the
 **Pipelines** tab of a single merge request. This might be [by configuration](../yaml/workflow.md#switch-between-branch-pipelines-and-merge-request-pipelines),
 or [by accident](#two-pipelines-when-pushing-to-a-branch).
 
-If both types of pipelines are in one merge request, the merge request's pipeline
-is not considered successful if:
-
-- The branch pipeline succeeds.
-- The merge request pipeline fails.
-
 When using the [merge when pipeline succeeds](../../user/project/merge_requests/merge_when_pipeline_succeeds.md)
 feature and both pipelines types are present, the merge request pipelines are checked,
 not the branch pipelines.
 
+Therefore, the MR pipeline result is marked as unsuccessful if the
+**merge request pipeline** fails, independently of the **branch pipeline** result.
+
+However:
+
+- These conditions are not enforced.
+- A race condition determines which pipeline's result is used to either block or pass merge requests.
+
+This bug is tracked on [issue 384927](https://gitlab.com/gitlab-org/gitlab/-/issues/384927).
+
 ### `An error occurred while trying to run a new pipeline for this merge request.`
 
 This error can happen when you select **Run pipeline** in a merge request, but the
diff --git a/doc/integration/jira/configure.md b/doc/integration/jira/configure.md
index c825b584b57..2533ce2b643 100644
--- a/doc/integration/jira/configure.md
+++ b/doc/integration/jira/configure.md
@@ -59,6 +59,28 @@ To configure your project:
 Your GitLab project can now interact with all Jira projects in your instance and the project now
 displays a Jira link that opens the Jira project.
 
+## Create a Jira Cloud API token
+
+To [integrate with Jira](index.md) in Atlassian Cloud, you must create an API token.
+
+To create a Jira Cloud API token:
+
+1. Sign in to [Atlassian](https://id.atlassian.com/manage-profile/security/api-tokens)
+   from an account with **write** access to Jira projects.
+
+   The link opens the **API tokens** page. Alternatively, from your Atlassian
+   profile, select **Account Settings > Security > Create and manage API tokens**.
+
+1. Select **Create API token**.
+1. In the dialog, enter a label for your token and select **Create**.
+
+To copy the API token, select **Copy** and paste the token somewhere safe.
+
+To configure GitLab, you need:
+
+- The newly created token
+- The email address you used when you created the token
+
 ## Migrate from Jira Server to Jira Cloud in GitLab
 
 To migrate from Jira Server to Jira Cloud in GitLab and maintain your Jira integration:
@@ -68,7 +90,7 @@ To migrate from Jira Server to Jira Cloud in GitLab and maintain your Jira integ
 1. Select **Jira**.
 1. In **Web URL**, enter the new Jira site URL (for example, `https://myjirasite.atlassian.net`).
 1. In **Username or Email**, enter the username or email registered on your Jira profile.
-1. [Create an API token](jira_cloud_configuration.md), and copy that value.
+1. [Create an API token](#create-a-jira-cloud-api-token), and copy that value.
 1. In **Password or API token**, paste the API token value.
 1. Optional. Select **Test settings** to check if the connection is working.
 1. Select **Save changes**.
diff --git a/doc/integration/jira/index.md b/doc/integration/jira/index.md
index 3ec4c7aee87..41d6cda4c84 100644
--- a/doc/integration/jira/index.md
+++ b/doc/integration/jira/index.md
@@ -64,7 +64,7 @@ The authentication method in Jira depends on whether you host Jira on your own s
   how to [set up a user in Jira Server](jira_server_configuration.md).
 - **Jira on Atlassian cloud** supports authentication through an API token. When connecting to Jira on
   Atlassian cloud, an email and API token are required. For more information, see
-  [Create a Jira Cloud API token](jira_cloud_configuration.md).
+  [Create a Jira Cloud API token](configure.md#create-a-jira-cloud-api-token).
 
 ## Privacy considerations
 
diff --git a/doc/integration/jira/jira_cloud_configuration.md b/doc/integration/jira/jira_cloud_configuration.md
index 9d52368f528..83321df0420 100644
--- a/doc/integration/jira/jira_cloud_configuration.md
+++ b/doc/integration/jira/jira_cloud_configuration.md
@@ -1,23 +1,11 @@
 ---
-stage: Manage
-group: Integrations
-info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
+redirect_to: 'configure.md#create-a-jira-cloud-api-token'
+remove_date: '2023-07-07'
 ---
 
-# Create a Jira Cloud API token **(FREE)**
+This document was moved to [another location](configure.md#create-a-jira-cloud-api-token).
 
-You need an API token to [integrate with Jira](index.md)
-in Atlassian Cloud. To create the API token:
-
-1. Sign in to [Atlassian](https://id.atlassian.com/manage-profile/security/api-tokens)
-   using an account with *write* access to Jira projects.
-
-   The link opens the API tokens page. Alternatively, to go to this page from your Atlassian
-   profile, select **Account Settings > Security > Create and manage API tokens**.
-1. Select **Create API token**.
-1. In the dialog, enter a label for your token and select **Create**.
-1. To copy the API token, select **Copy**, then paste the token somewhere safe.
-
-You need the newly created token, and the email
-address you used when you created it, when you
-[configure GitLab](configure.md).
+<!-- This redirect file can be deleted after <2023-07-07>. -->
+<!-- Redirects that point to other docs in the same project expire in three months. -->
+<!-- Redirects that point to docs in a different project or site (for example, link is not relative and starts with `https:`) expire in one year. -->
+<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/redirects.html -->
diff --git a/doc/user/permissions.md b/doc/user/permissions.md
index 928e2dbe6a2..4ca10caef86 100644
--- a/doc/user/permissions.md
+++ b/doc/user/permissions.md
@@ -23,6 +23,7 @@ The available roles are:
 - Developer
 - Maintainer
 - Owner
+- Minimal Access (available for the top-level group only)
 
 A user assigned the Guest role has the least permissions,
 and the Owner has the most.
@@ -423,28 +424,28 @@ nested groups if you have membership in one of its parents.
 For more information, see
 [subgroup memberships](group/subgroups/index.md#subgroup-membership).
 
-## Users with minimal access **(PREMIUM)**
+## Users with Minimal Access **(PREMIUM)**
 
 > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40942) in GitLab 13.4.
-> - Support for inviting users with minimal access role [introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/106438) in GitLab 15.9.
+> - Support for inviting users with Minimal Access role [introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/106438) in GitLab 15.9.
 
-Owners can add members with a "minimal access" role to a root group. Such users do not:
+Users with the Minimal Access role:
 
 - Count as licensed seats on self-managed Ultimate subscriptions or any GitLab.com subscriptions.
 - Automatically have access to projects and subgroups in that root group.
 
-Owners must explicitly add these "minimal access" users to the specific subgroups and
+Owners must explicitly add these users to the specific subgroups and
 projects.
 
-You can use minimal access to give the same member more than one role in a group:
+You can use the Minimal Access role to give the same member more than one role in a group:
 
-1. Add the member to the root group with a minimal access role.
+1. Add the member to the root group with a Minimal Access role.
 1. Invite the member as a direct member with a specific role in any subgroup or project in that group.
 
-Because of an [outstanding issue](https://gitlab.com/gitlab-org/gitlab/-/issues/267996), when minimal access users:
+Because of an [outstanding issue](https://gitlab.com/gitlab-org/gitlab/-/issues/267996), when a user with the Minimal Access role:
 
-- Sign in with standard web authentication, they receive a `404` error when accessing the parent group.
-- Sign in with Group SSO, they receive a `404` error immediately because they are redirected to the parent group page.
+- Signs in with standard web authentication, they receive a `404` error when accessing the parent group.
+- Signs in with Group SSO, they receive a `404` error immediately because they are redirected to the parent group page.
 
 To work around the issue, give these users the Guest role or higher to any project or subgroup within the parent group.
 
@@ -538,8 +539,4 @@ the Owner role:
 ### Known issues
 
 - Additional permissions can only be applied to users with the Guest role.
-- There is no visual distinction in the UI between the Guest role and the Guest role with additional permission. For more information, see [issue 384099](https://gitlab.com/gitlab-org/gitlab/-/issues/384099).
 - If a user with a custom role is shared with a group or project, their custom role is not transferred over with them. The user has the regular Guest role in the new group or project.
-- If a custom role is deleted, the users associated with that custom role are also removed from the group. For more information, see [issue 370352](https://gitlab.com/gitlab-org/gitlab/-/issues/370352).
-- The API endpoint for associating a custom role with a user only works for users with the Guest role in a group. A project member can be associated with a custom role, but not through the API yet. For more information, see [issue 385495](https://gitlab.com/gitlab-org/gitlab/-/issues/385495).
-- The only way to remove a custom role from a user's membership to a Group is to delete the custom role, which deletes the user membership entirely. See [issue 387769](https://gitlab.com/gitlab-org/gitlab/-/issues/387769).