Add latest changes from gitlab-org/gitlab@master

3 files changed, 14 insertions, 55 deletions

diff --git a/doc/development/application_slis/rails_request_apdex.md b/doc/development/application_slis/rails_request_apdex.md
index 373589aaefc..f9613a14dd1 100644
--- a/doc/development/application_slis/rails_request_apdex.md
+++ b/doc/development/application_slis/rails_request_apdex.md
@@ -136,8 +136,19 @@ information in the logs to check:
 
 1. The table loads information for the busiest endpoints by
    default. To speed the response, add both:
-   - A filter for `json.caller_id.keyword`.
-   - The identifier you're interested in, such as `Projects::RawController#show`.
+
+   - A filter for `json.meta.caller_id.keyword`.
+   - The identifier you're interested in, for example:
+
+     ```ruby
+     Projects::RawController#show
+     ```
+
+     or:
+
+     ```plaintext
+     GET /api/:version/projects/:id/snippets/:snippet_id/raw
+     ```
 
 1. Check the [appropriate percentile duration](#request-apdex-slo) for
    the service handling the endpoint. The overall duration should
diff --git a/doc/development/database/multiple_databases.md b/doc/development/database/multiple_databases.md
index 3b1b06b557c..beb6b938730 100644
--- a/doc/development/database/multiple_databases.md
+++ b/doc/development/database/multiple_databases.md
@@ -579,58 +579,6 @@ ensures that we forbid destroying the parent object if something is not cleaned
 If all you need to do is clean up the child records themselves from PostgreSQL,
 consider using [loose foreign keys](loose_foreign_keys.md).
 
-## `config/database.yml`
-
-GitLab is adding support to run multiple databases, for example to
-[separate tables for the continuous integration features](https://gitlab.com/groups/gitlab-org/-/epics/6167)
-from the main database. In order to prepare for this change, we
-[validate the structure of the configuration](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/67877)
-in `database.yml` to ensure that only known databases are used.
-
-Previously, the `config/database.yml` looked like this:
-
-```yaml
-production:
-  adapter: postgresql
-  encoding: unicode
-  database: gitlabhq_production
-  ...
-```
-
-With the support for many databases this
-syntax is [deprecated](https://gitlab.com/gitlab-org/gitlab/-/issues/338182)
-and will be removed in [15.0](https://gitlab.com/gitlab-org/gitlab/-/issues/338182).
-
-The new `config/database.yml` needs to include a database name
-to define a database configuration. Only `main:` and `ci:` database
-names are supported. The `main:` database must always be a first
-entry in a hash. This change applies to decomposed and non-decomposed
-change. If an invalid or deprecated syntax is used the error
-or warning is printed during application start.
-
-```yaml
-# Non-decomposed database
-production:
-  main:
-    adapter: postgresql
-    encoding: unicode
-    database: gitlabhq_production
-    ...
-
-# Decomposed database
-production:
-  main:
-    adapter: postgresql
-    encoding: unicode
-    database: gitlabhq_production
-    ...
-  ci:
-    adapter: postgresql
-    encoding: unicode
-    database: gitlabhq_production_ci
-    ...
-```
-
 ## Foreign keys that cross databases
 
 There are many places where we use foreign keys that reference across the two
diff --git a/doc/development/geo.md b/doc/development/geo.md
index f37901754aa..a7725c34680 100644
--- a/doc/development/geo.md
+++ b/doc/development/geo.md
@@ -212,7 +212,7 @@ rails g geo_migration [args] [options]
 To migrate the tracking database, run:
 
 ```shell
-bundle exec rake geo:db:migrate
+bundle exec rake db:migrate:geo
 ```
 
 ## Finders