Add latest changes from gitlab-org/gitlab@master

5 files changed, 30 insertions, 19 deletions

diff --git a/doc/api/graphql/reference/index.md b/doc/api/graphql/reference/index.md
index 2547851dbb3..7661f2ec9a6 100644
--- a/doc/api/graphql/reference/index.md
+++ b/doc/api/graphql/reference/index.md
@@ -23733,7 +23733,7 @@ Represents a state transition of a vulnerability.
 
 | Name | Type | Description |
 | ---- | ---- | ----------- |
-| <a id="vulnerabilitystatetransitiontypeauthor"></a>`author` | [`UserCore!`](#usercore) | User who changed the state of the vulnerability. |
+| <a id="vulnerabilitystatetransitiontypeauthor"></a>`author` | [`UserCore`](#usercore) | User who changed the state of the vulnerability. |
 | <a id="vulnerabilitystatetransitiontypecomment"></a>`comment` | [`String`](#string) | Comment for the state change. |
 | <a id="vulnerabilitystatetransitiontypecreatedat"></a>`createdAt` | [`Time!`](#time) | Time of the state change of the vulnerability. |
 | <a id="vulnerabilitystatetransitiontypedismissalreason"></a>`dismissalReason` | [`VulnerabilityDismissalReason`](#vulnerabilitydismissalreason) | Reason for the dismissal. |
diff --git a/doc/ci/jobs/index.md b/doc/ci/jobs/index.md
index b9c2ee409b8..c446d89da41 100644
--- a/doc/ci/jobs/index.md
+++ b/doc/ci/jobs/index.md
@@ -342,7 +342,7 @@ In the example above:
   job log, but they are displayed in the raw job log. To see them, in the upper-right corner
   of the job log, select **Show complete raw** (**{doc-text}**).
   - `\r`: carriage return.
-  - `\e[0K`: clear line ANSI escape code.
+  - `\e[0K`: clear line ANSI escape sequence (`\e[K` does not work, the `0` must be included).
 
 Sample raw job log:
 
diff --git a/doc/development/cicd/cicd_tables.md b/doc/development/cicd/cicd_tables.md
index b246328a817..8cfb0faca00 100644
--- a/doc/development/cicd/cicd_tables.md
+++ b/doc/development/cicd/cicd_tables.md
@@ -29,7 +29,7 @@ Here is an example on how to use database helpers to create a new table and fore
     end
 
     add_concurrent_partitioned_foreign_key(
-      :p_ci_examples, :ci_builds,
+      :p_ci_examples, :p_ci_builds,
       column: [:partition_id, :build_id],
       target_column: [:partition_id, :id],
       on_update: :cascade,
@@ -51,7 +51,7 @@ When creating the routing table:
 - The table name must start with the `p_` prefix. There are analyzers in place to ensure that all queries go
   through the routing tables and do not access the partitions directly.
 - Each new table needs a `partition_id` column and its value must equal
-  the value from the related association. In this example, that is `ci_builds`. All resources
+  the value from the related association. In this example, that is `p_ci_builds`. All resources
   belonging to a pipeline share the same `partition_id` value.
 - The primary key must have the columns ordered this way to allow efficient
   search only by `id`.
@@ -74,7 +74,7 @@ the application runs:
   def up
     with_lock_retries do
       connection.execute(<<~SQL)
-        LOCK TABLE ci_builds IN SHARE UPDATE EXCLUSIVE MODE;
+        LOCK TABLE p_ci_builds IN SHARE ROW EXCLUSIVE MODE;
         LOCK TABLE ONLY p_ci_examples IN ACCESS EXCLUSIVE MODE;
       SQL
 
@@ -92,7 +92,7 @@ Partitions are created in `gitlab_partitions_dynamic` schema.
 When creating a partition, remember:
 
 - Partition names do not use the `p_` prefix.
-- The default value for `partition_id` is `100`.
+- The starting value for `partition_id` is `100`.
 
 ## Cascade the partition value
 
diff --git a/doc/development/documentation/styleguide/index.md b/doc/development/documentation/styleguide/index.md
index ca6475566b3..e0fce2db84d 100644
--- a/doc/development/documentation/styleguide/index.md
+++ b/doc/development/documentation/styleguide/index.md
@@ -856,7 +856,7 @@ Sometimes they are more precise and will be maintained more actively.
 
 For each external link you add, weigh the customer benefit with the maintenance difficulties.
 
-### Links requiring permissions
+### Links that require permissions
 
 Don't link directly to:
 
@@ -864,23 +864,26 @@ Don't link directly to:
 - Project features that require [special permissions](../../../user/permissions.md)
   to view.
 
-These fail for:
+These links fail for:
 
 - Those without sufficient permissions.
 - Automated link checkers.
 
-Instead:
+If you must use one of these links:
 
-- To reduce confusion, mention in the text that the information is either:
-  - Contained in a confidential issue.
-  - Requires special permission to a project to view.
-- Provide a link in back ticks (`` ` ``) so that those with access to the issue
-  can navigate to it.
+- Mention that the information is confidential or requires specific permissions.
+- Put the link in backticks, so that it does not cause link checkers to fail.
 
-Example:
+Examples:
 
 ```markdown
-For more information, see the [confidential issue](../../../user/project/issues/confidential_issues.md) `https://gitlab.com/gitlab-org/gitlab-foss/-/issues/<issue_number>`.
+GitLab team members can view more information in this confidential issue:
+`https://gitlab.com/gitlab-org/gitlab/-/issues/<issue_number>`
+```
+
+```markdown
+Users with the Maintainer role for the project can use the pipeline editor:
+`https://gitlab.com/gitlab-org/gitlab/-/ci/editor`
 ```
 
 ### Link to specific lines of code
diff --git a/doc/user/project/repository/reducing_the_repo_size_using_git.md b/doc/user/project/repository/reducing_the_repo_size_using_git.md
index d519fda764f..ce3a5ee9916 100644
--- a/doc/user/project/repository/reducing_the_repo_size_using_git.md
+++ b/doc/user/project/repository/reducing_the_repo_size_using_git.md
@@ -74,7 +74,7 @@ To purge files from a GitLab repository:
 1. Clone a fresh copy of the repository from the bundle using  `--bare` and `--mirror` options:
 
    ```shell
-   git clone --bare /path/to/project.bundle
+   git clone --bare --mirror /path/to/project.bundle
    ```
 
 1. Go to the `project.git` directory:
@@ -134,6 +134,12 @@ To purge files from a GitLab repository:
    Repeat this step and all following steps (including the [repository cleanup](#repository-cleanup) step)
    every time you run any `git filter-repo` command.
 
+1. To allow you to force push the changes you need to unset the mirror flag:
+
+   ```shell
+    git config --unset remote.origin.mirror
+   ```
+
 1. Force push your changes to overwrite all branches on GitLab:
 
    ```shell
@@ -167,8 +173,6 @@ To purge files from a GitLab repository:
 
 ## Repository cleanup
 
-> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/issues/19376) in GitLab 11.6.
-
 Repository cleanup allows you to upload a text file of objects and GitLab removes internal Git
 references to these objects. You can use
 [`git filter-repo`](https://github.com/newren/git-filter-repo) to produce a list of objects (in a
@@ -180,6 +184,10 @@ of the operation. This happens automatically, but submitting the cleanup request
 fails if any writes are ongoing, so cancel any outstanding `git push`
 operations before continuing.
 
+WARNING:
+Removing internal Git references results in associated merge request commits, pipelines, and changes details
+no longer being available.
+
 To clean up a repository:
 
 1. Go to the project for the repository.