Add latest changes from gitlab-org/gitlab@16-0-stable-eev16.0.0-rc42

1 files changed, 10 insertions, 1 deletions

diff --git a/doc/raketasks/backup_restore.md b/doc/raketasks/backup_restore.md
index a13d38a199d..18303a5f45c 100644
--- a/doc/raketasks/backup_restore.md
+++ b/doc/raketasks/backup_restore.md
@@ -665,11 +665,20 @@ You may need to reconfigure or restart GitLab for the changes to take effect.
 
 1. Clear all the tokens for pending jobs:
 
+   For GitLab 15.3 and earlier:
+
    ```sql
    -- Clear build tokens
    UPDATE ci_builds SET token = null, token_encrypted = null;
    ```
 
+   For GitLab 15.4 and later:
+
+   ```sql
+   -- Clear build tokens
+   UPDATE ci_builds SET token_encrypted = null;
+   ```
+
 A similar strategy can be employed for the remaining features. By removing the
 data that can't be decrypted, GitLab can be returned to operation, and the
 lost data can be manually replaced.
@@ -788,7 +797,7 @@ Truncating filenames to resolve the error involves:
 
 #### Clean up remote uploaded files
 
-A [known issue](https://gitlab.com/gitlab-org/gitlab-foss/issues/45425) caused object store uploads to remain after a parent resource was deleted. This issue was [resolved](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/18698).
+A [known issue](https://gitlab.com/gitlab-org/gitlab-foss/-/issues/45425) caused object store uploads to remain after a parent resource was deleted. This issue was [resolved](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/18698).
 
 To fix these files, you must clean up all remote uploaded files that are in the storage but not tracked in the `uploads` database table.