Add latest changes from gitlab-org/gitlab@master

changelogs/unreleased/cancel-merge-train-pipeline-when-dropped.yml

+---
+title: Cancel running pipelines when merge request is dropped from merge train
+merge_request: 22146
+author:
+type: fixed

doc/administration/housekeeping.md

@@ -6,12 +6,12 @@
 
 GitLab automatically runs `git gc` and `git repack` on repositories
 after Git pushes. You can change how often this happens or turn it off in
-**Admin area > Settings > Repository** (`/admin/application_settings/repository`).
+**Admin Area > Settings > Repository** (`/admin/application_settings/repository`).
 
 ## Manual housekeeping
 
 The housekeeping function runs `repack` or `gc` depending on the
-**Housekeeping** settings configured in **Admin area > Settings > Repository**.
+**Housekeeping** settings configured in **Admin Area > Settings > Repository**.
 
 For example in the following scenario a `git repack -d` will be executed:
 

doc/administration/repository_checks.md

@@ -37,7 +37,7 @@ in `repocheck.log`:
   - `/home/git/gitlab/log` for installations from source
 
 If the periodic repository check causes false alarms, you can clear all repository check states by
-navigating to **Admin area > Settings > Repository**
+navigating to **Admin Area > Settings > Repository**
 (`/admin/application_settings/repository`) and clicking **Clear all repository checks**.
 
 ---