Add latest changes from gitlab-org/gitlab@master

2 files changed, 19 insertions, 4 deletions

diff --git a/doc/architecture/blueprints/secret_detection/index.md b/doc/architecture/blueprints/secret_detection/index.md
index b961f4e69a6..fc97ca71d7f 100644
--- a/doc/architecture/blueprints/secret_detection/index.md
+++ b/doc/architecture/blueprints/secret_detection/index.md
@@ -61,7 +61,7 @@ Management of detected secrets will remain distinct from the
 When a detected secret is identified, it has already been compromised due to
 their presence in the target object (that is a repository). Alternatively, managed
 secrets should be stored with stricter standards for secure storage, including
-encryption and masking when visible (such as jog logs or in the UI).
+encryption and masking when visible (such as job logs or in the UI).
 
 As a long-term priority we should consider unifying the management of the two
 secret types however that work is out of scope for the current blueprints goals,
diff --git a/doc/update/index.md b/doc/update/index.md
index 47855fa3885..c8fa091c657 100644
--- a/doc/update/index.md
+++ b/doc/update/index.md
@@ -1629,9 +1629,24 @@ gitaly['configuration'] = {
       },
     ],
   },
-  # gitaly['storage']. While the structure is the same, the string keys in the array elements
-  # should be replaced by symbols as elsewhere. {'key' => 'value'}, should become {key: 'value'}.
-  storage: ...,
+  # Storage could previously be configured through either gitaly['storage'] or 'git_data_dirs'. Migrate
+  # the relevant configuration according to the instructions below.
+  storage: [
+    {
+      # gitaly['storage'][<index>]['name']
+      #
+      # git_data_dirs[<name>]. The storage name was configured as a key in the map.
+      name: ...,
+      # gitaly['storage'][<index>]['path']
+      #
+      # git_data_dirs[<name>]['path']. Use the value from git_data_dirs[<name>]['path'] and append '/repositories' to it.
+      #
+      # For example, if the path in 'git_data_dirs' was '/var/opt/gitlab/git-data', use
+      # '/var/opt/gitlab/git-data/repositories'. The '/repositories' extension was automatically
+      # appended to the path configured in `git_data_dirs`.
+      path: ...,
+    },
+  ],
   hooks: {
     # gitaly['custom_hooks_dir']
     custom_hooks_dir: ...,