Add latest changes from gitlab-org/gitlab@14-6-stable-eev14.6.0-rc42

3 files changed, 20 insertions, 5 deletions

diff --git a/doc/raketasks/backup_restore.md b/doc/raketasks/backup_restore.md
index cd541e7827f..676cc529c98 100644
--- a/doc/raketasks/backup_restore.md
+++ b/doc/raketasks/backup_restore.md
@@ -13,7 +13,7 @@ all repositories and all attachments.
 
 You can only restore a backup to **exactly the same version and type (CE/EE)**
 of GitLab on which it was created. The best way to migrate your repositories
-from one server to another is through backup restore.
+from one server to another is through a backup and restore.
 
 WARNING:
 GitLab doesn't back up items that aren't stored in the file system. If you're
@@ -70,7 +70,7 @@ Backups do not include:
 - [Mattermost data](https://docs.mattermost.com/administration/config-settings.html#file-storage)
 
 WARNING:
-GitLab does not back up any configuration files, SSL certificates, or system
+GitLab does not back up any configuration files (`/etc/gitlab`), TLS keys and certificates, or system
 files. You are highly advised to read about [storing configuration files](#storing-configuration-files).
 
 WARNING:
@@ -190,8 +190,9 @@ on a Kubernetes cluster, you must follow the
 [Back up the secrets](https://docs.gitlab.com/charts/backup-restore/backup.html#backup-the-secrets)
 instructions.
 
-You may also want to back up any TLS keys and certificates, and your
-[SSH host keys](https://superuser.com/questions/532040/copy-ssh-keys-from-one-server-to-another-server/532079#532079).
+You may also want to back up any TLS keys and certificates (`/etc/gitlab/ssl`, `/etc/gitlab/trusted-certs`), and your
+[SSH host keys](https://superuser.com/questions/532040/copy-ssh-keys-from-one-server-to-another-server/532079#532079)
+to avoid man-in-the-middle attack warnings if you have to perform a full machine restore.
 
 If you use Omnibus GitLab, review additional information to
 [backup your configuration](https://docs.gitlab.com/omnibus/settings/backups.html).
@@ -903,7 +904,9 @@ If you fail to restore this encryption key file along with the application data
 backup, users with two-factor authentication enabled and GitLab Runner
 loses access to your GitLab server.
 
-You may also want to restore any TLS keys, certificates, or
+You may also want to restore your previous `/etc/gitlab/gitlab.rb` (for Omnibus packages)
+or `/home/git/gitlab/config/gitlab.yml` (for installations from source) and
+any TLS keys, certificates (`/etc/gitlab/ssl`, `/etc/gitlab/trusted-certs`), or
 [SSH host keys](https://superuser.com/questions/532040/copy-ssh-keys-from-one-server-to-another-server/532079#532079).
 
 Starting with GitLab 12.9, if an untarred backup (like the ones made with
@@ -1419,6 +1422,13 @@ after which users must reactivate 2FA.
    DELETE FROM ci_variables;
    ```
 
+1. If you know the specific group or project from which you wish to delete variables, you can include a `WHERE` statement to specify that in your `DELETE`:
+
+   ```sql
+   DELETE FROM ci_group_variables WHERE group_id = <GROUPID>;
+   DELETE FROM ci_variables WHERE project_id = <PROJECTID>;
+   ```
+
 You may need to reconfigure or restart GitLab for the changes to take effect.
 
 #### Reset runner registration tokens
diff --git a/doc/raketasks/index.md b/doc/raketasks/index.md
index 80aa52ed5a4..6227731e807 100644
--- a/doc/raketasks/index.md
+++ b/doc/raketasks/index.md
@@ -45,6 +45,7 @@ The following Rake tasks are available for use with GitLab:
 | [SMTP maintenance](../administration/raketasks/smtp.md) | SMTP-related tasks. |
 | [SPDX license list import](spdx.md)                   | Import a local copy of the [SPDX license list](https://spdx.org/licenses/) for matching [License Compliance policies](../user/compliance/license_compliance/index.md). |
 | [Repository storage](../administration/raketasks/storage.md) | List and migrate existing projects and attachments from legacy storage to hashed storage. |
+| [Reset user passwords](../security/reset_user_password.md#use-a-rake-task) | Reset user passwords using Rake. |
 | [Uploads migrate](../administration/raketasks/uploads/migrate.md) | Migrate uploads between local storage and object storage. |
 | [Uploads sanitize](../administration/raketasks/uploads/sanitize.md) | Remove EXIF data from images uploaded to earlier versions of GitLab. |
 | [Service Data](../administration/troubleshooting/gitlab_rails_cheat_sheet.md#generate-service-ping) | Generate and troubleshoot [Service Ping](../development/service_ping/index.md). |
diff --git a/doc/raketasks/user_management.md b/doc/raketasks/user_management.md
index f63c35ab475..09e1b626c0a 100644
--- a/doc/raketasks/user_management.md
+++ b/doc/raketasks/user_management.md
@@ -176,3 +176,7 @@ cp config/secrets.yml.bak config/secrets.yml
 sudo /etc/init.d/gitlab start
 
 ```
+
+## Related topics
+
+- [Reset a user's password](../security/reset_user_password.md#use-a-rake-task).