Add latest changes from gitlab-org/gitlab@13-3-stable-ee

12 files changed, 97 insertions, 5 deletions

diff --git a/doc/topics/git/feature_branch_development.md b/doc/topics/git/feature_branch_development.md
index ab3adf54dd7..762eddbc130 100644
--- a/doc/topics/git/feature_branch_development.md
+++ b/doc/topics/git/feature_branch_development.md
@@ -1,4 +1,7 @@
 ---
+stage: Create
+group: Source Code
+info: "To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#designated-technical-writers"
 type: how-tos
 ---
 
diff --git a/doc/topics/git/how_to_install_git/index.md b/doc/topics/git/how_to_install_git/index.md
index 75ea6183a32..7b842b6a409 100644
--- a/doc/topics/git/how_to_install_git/index.md
+++ b/doc/topics/git/how_to_install_git/index.md
@@ -1,4 +1,7 @@
 ---
+stage: Create
+group: Source Code
+info: "To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#designated-technical-writers"
 author: Sean Packham
 author_gitlab: SeanPackham
 level: beginner
diff --git a/doc/topics/git/img/create_merge_request_v13_1.png b/doc/topics/git/img/create_merge_request_v13_1.png
index a725149f6a2..d59cfc74290 100644
--- a/doc/topics/git/img/create_merge_request_v13_1.png
+++ b/doc/topics/git/img/create_merge_request_v13_1.png
diff --git a/doc/topics/git/img/modify_branches_v13_1.png b/doc/topics/git/img/modify_branches_v13_1.png
index dc517dd249f..781f54fc3c0 100644
--- a/doc/topics/git/img/modify_branches_v13_1.png
+++ b/doc/topics/git/img/modify_branches_v13_1.png
diff --git a/doc/topics/git/index.md b/doc/topics/git/index.md
index 89da3dfdbd0..92181fb7bb0 100644
--- a/doc/topics/git/index.md
+++ b/doc/topics/git/index.md
@@ -1,4 +1,7 @@
 ---
+stage: Create
+group: Source Code
+info: "To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#designated-technical-writers"
 type: index
 ---
 
diff --git a/doc/topics/git/lfs/index.md b/doc/topics/git/lfs/index.md
index 1e2f45fd67b..5875cdd4ca1 100644
--- a/doc/topics/git/lfs/index.md
+++ b/doc/topics/git/lfs/index.md
@@ -1,4 +1,8 @@
 ---
+stage: Create
+group: Source Code
+info: "To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#designated-technical-writers"
+type: reference, howto
 disqus_identifier: 'https://docs.gitlab.com/ee/workflow/lfs/lfs/index.html'
 ---
 
diff --git a/doc/topics/git/lfs/migrate_from_git_annex_to_git_lfs.md b/doc/topics/git/lfs/migrate_from_git_annex_to_git_lfs.md
index 09087fcae13..c62b7e1cc12 100644
--- a/doc/topics/git/lfs/migrate_from_git_annex_to_git_lfs.md
+++ b/doc/topics/git/lfs/migrate_from_git_annex_to_git_lfs.md
@@ -1,6 +1,13 @@
+---
+stage: Create
+group: Source Code
+info: "To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#designated-technical-writers"
+type: reference, howto
+---
+
 # Migration guide from Git Annex to Git LFS
 
->**Note:**
+NOTE: **Note:**
 Git Annex support [has been removed](https://gitlab.com/gitlab-org/gitlab/-/issues/1648) in GitLab Enterprise
 Edition 9.0 (2017/03/22).
 
@@ -30,7 +37,7 @@ ones that GitLab developed.
 
 ## Migration steps
 
->**Note:**
+NOTE: **Note:**
 Since Git Annex files are stored in a sub-directory of the normal repositories
 (`.git/annex/objects`) and LFS files are stored outside of the repositories,
 they are not compatible as they are using a different scheme. Therefore, the
diff --git a/doc/topics/git/lfs/migrate_to_git_lfs.md b/doc/topics/git/lfs/migrate_to_git_lfs.md
index 3e287c0816d..944f4d8f78d 100644
--- a/doc/topics/git/lfs/migrate_to_git_lfs.md
+++ b/doc/topics/git/lfs/migrate_to_git_lfs.md
@@ -96,9 +96,10 @@ Consider an example upstream project, `git@gitlab.com:gitlab-tests/test-git-lfs-
 1. Clean up the repository:
 
    ```shell
-   # cd path/to/mirror/repo:
+   # Change into the mirror repo directory:
    cd test-git-lfs-repo-migration.git
-   # clean up the repo:
+
+   # Clean up the repo:
    git reflog expire --expire=now --all && git gc --prune=now --aggressive
    ```
 
@@ -128,12 +129,23 @@ Consider an example upstream project, `git@gitlab.com:gitlab-tests/test-git-lfs-
 1. Track the files you want with LFS:
 
    ```shell
-   # cd path/to/upstream/repo:
+   # Change into the /tmp directory
+   cd /tmp
+
+   # Clone the repo
+   git clone git@gitlab.com:gitlab-tests/test-git-lfs-repo-migration.git
+
+   # Change into the upstream repo directory:
    cd test-git-lfs-repo-migration
+
    # You may need to reset your local copy with upstream's `master` after force-pushing from the mirror:
    git reset --hard origin/master
+
    # Track the files with LFS:
    git lfs track "*.gif" "*.png" "*.jpg" "*.psd" "*.mp4" "img/"
+
+   # Push up changes to .gitattributes
+   git add .gitattributes && git commit -m 'Track .gif,.png,.jpg,.psd,.mp4 and img/' && git push
    ```
 
    Now all existing the files you converted, as well as the new
diff --git a/doc/topics/git/numerous_undo_possibilities_in_git/index.md b/doc/topics/git/numerous_undo_possibilities_in_git/index.md
index fdf86d8f646..285ab133196 100644
--- a/doc/topics/git/numerous_undo_possibilities_in_git/index.md
+++ b/doc/topics/git/numerous_undo_possibilities_in_git/index.md
@@ -1,4 +1,7 @@
 ---
+stage: Create
+group: Source Code
+info: "To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#designated-technical-writers"
 author: Crt Mori
 author_gitlab: Letme
 level: intermediary
diff --git a/doc/topics/git/partial_clone.md b/doc/topics/git/partial_clone.md
index de25c8a3283..c976eda688a 100644
--- a/doc/topics/git/partial_clone.md
+++ b/doc/topics/git/partial_clone.md
@@ -1,3 +1,10 @@
+---
+stage: Create
+group: Source Code
+info: "To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#designated-technical-writers"
+type: reference, howto
+---
+
 # Partial Clone
 
 As Git repositories grow in size, they can become cumbersome to work with
@@ -182,3 +189,47 @@ For more details, see the Git documentation for
    # Checkout master
    git checkout master
    ```
+
+## Remove partial clone filtering
+
+Git repositories with partial clone filtering can have the filtering removed. To
+remove filtering:
+
+1. Fetch everything that has been excluded by the filters, to make sure that the
+   repository is complete. If `git sparse-checkout` was used, use
+   `git sparse-checkout disable` to disable it. See the
+   [`disable` documentation](https://git-scm.com/docs/git-sparse-checkout#Documentation/git-sparse-checkout.txt-emdisableem)
+   for more information.
+
+   Then do a regular `fetch` to ensure that the repository is complete. To check if
+   there are missing objects to fetch, and then fetch them, especially when not using
+   `git sparse-checkout`, the following commands can be used:
+
+   ```shell
+   # Show missing objects
+   git rev-list --objects --all --missing=print | grep -e '^\?'
+
+   # Show missing objects without a '?' character before them (needs GNU grep)
+   git rev-list --objects --all --missing=print | grep -oP '^\?\K\w+'
+
+   # Fetch missing objects
+   git fetch origin $(git rev-list --objects --all --missing=print | grep -oP '^\?\K\w+')
+
+   # Show number of missing objects
+   git rev-list --objects --all --missing=print | grep -e '^\?' | wc -l
+   ```
+
+1. Repack everything. This can be done using `git repack -a -d`, for example. This
+   should leave only three files in `.git/objects/pack/`:
+   - A `pack-<SHA1>.pack` file.
+   - Its corresponding `pack-<SHA1>.idx` file.
+   - A `pack-<SHA1>.promisor` file.
+
+1. Delete the `.promisor` file. The above step should have left only one
+   `pack-<SHA1>.promisor` file, which should be empty and should be deleted.
+
+1. Remove partial clone configuration. The partial clone-related configuration
+   variables should be removed from Git config files. Usually only the following
+   configuration must be removed:
+   - `remote.origin.promisor`.
+   - `remote.origin.partialclonefilter`.
diff --git a/doc/topics/git/troubleshooting_git.md b/doc/topics/git/troubleshooting_git.md
index 010a811bd33..523718e4133 100644
--- a/doc/topics/git/troubleshooting_git.md
+++ b/doc/topics/git/troubleshooting_git.md
@@ -1,4 +1,7 @@
 ---
+stage: Create
+group: Source Code
+info: "To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#designated-technical-writers"
 type: howto
 ---
 
diff --git a/doc/topics/git/useful_git_commands.md b/doc/topics/git/useful_git_commands.md
index 711567dbd06..0bf6075a1ea 100644
--- a/doc/topics/git/useful_git_commands.md
+++ b/doc/topics/git/useful_git_commands.md
@@ -1,4 +1,7 @@
 ---
+stage: Create
+group: Source Code
+info: "To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#designated-technical-writers"
 type: reference
 ---