Add latest changes from gitlab-org/gitlab@master

8 files changed, 58 insertions, 20 deletions

diff --git a/doc/administration/postgresql/index.md b/doc/administration/postgresql/index.md
index f48e537064a..e829397abc1 100644
--- a/doc/administration/postgresql/index.md
+++ b/doc/administration/postgresql/index.md
@@ -8,26 +8,29 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 
 In this section, you are guided through configuring a PostgreSQL database to
 be used with GitLab in one of our [reference architectures](../reference_architectures/index.md).
-There are essentially three setups to choose from.
 
-## Standalone PostgreSQL using Omnibus GitLab
+## Configuration options
+
+Choose one of the following PostgreSQL configuration options:
+
+### Standalone PostgreSQL using Omnibus GitLab
 
 This setup is for when you have installed the
 [Omnibus GitLab packages](https://about.gitlab.com/install/) (CE or EE),
 to use the bundled PostgreSQL having only its service enabled.
 
-[> Read how to set up a standalone PostgreSQL instance using Omnibus GitLab](standalone.md)
+Read how to [set up a standalone PostgreSQL instance](standalone.md) using Omnibus GitLab.
 
-## Provide your own PostgreSQL instance
+### Provide your own PostgreSQL instance
 
 This setup is for when you have installed GitLab using the
 [Omnibus GitLab packages](https://about.gitlab.com/install/) (CE or EE),
 or installed it [from source](../../install/installation.md), but you want to use
 your own external PostgreSQL server.
 
-[> Read how to set up an external PostgreSQL instance](external.md)
+Read how to [set up an external PostgreSQL instance](external.md).
 
-## PostgreSQL replication and failover with Omnibus GitLab **(PREMIUM SELF)**
+### PostgreSQL replication and failover with Omnibus GitLab **(PREMIUM SELF)**
 
 This setup is for when you have installed GitLab using the
 [Omnibus GitLab **Enterprise Edition** (EE) package](https://about.gitlab.com/install/?version=ee).
@@ -35,4 +38,12 @@ This setup is for when you have installed GitLab using the
 All the tools that are needed like PostgreSQL, PgBouncer, and Patroni are bundled in
 the package, so you can use it to set up the whole PostgreSQL infrastructure (primary, replica).
 
-[> Read how to set up PostgreSQL replication and failover using Omnibus GitLab](replication_and_failover.md)
+Read how to [set up PostgreSQL replication and failover](replication_and_failover.md) using Omnibus GitLab.
+
+## Related topics
+
+- [Working with the bundled PgBouncer service](pgbouncer.md)
+- [Database load balancing](database_load_balancing.md)
+- [Moving GitLab databases to a different PostgreSQL instance](moving.md)
+- [Multiple databases](multiple_databases.md)
+- [Database guides for GitLab development](../../development/database/index.md)
diff --git a/doc/api/group_badges.md b/doc/api/group_badges.md
index 63aced3cc47..ede7591c6d1 100644
--- a/doc/api/group_badges.md
+++ b/doc/api/group_badges.md
@@ -80,6 +80,7 @@ Example response:
 
 ```json
 {
+  "name": "Coverage",
   "id": 1,
   "link_url": "http://example.com/ci_status.svg?project=%{project_path}&ref=%{default_branch}",
   "image_url": "https://shields.io/my/badge",
@@ -102,10 +103,11 @@ POST /groups/:id/badges
 | `id`      | integer/string | yes | The ID or [URL-encoded path of the group](rest/index.md#namespaced-path-encoding) owned by the authenticated user |
 | `link_url` | string         | yes | URL of the badge link |
 | `image_url` | string | yes | URL of the badge image |
+| `name` | string | no | Name of the badge |
 
 ```shell
 curl --request POST --header "PRIVATE-TOKEN: <your_access_token>" \
-     --data "link_url=https://gitlab.com/gitlab-org/gitlab-foss/commits/master&image_url=https://shields.io/my/badge1&position=0" \
+     --data "link_url=https://gitlab.com/gitlab-org/gitlab-foss/commits/master&image_url=https://shields.io/my/badge1&name=mybadge&position=0" \
      "https://gitlab.example.com/api/v4/groups/:id/badges"
 ```
 
@@ -114,6 +116,7 @@ Example response:
 ```json
 {
   "id": 1,
+  "name": "mybadge",
   "link_url": "https://gitlab.com/gitlab-org/gitlab-foss/commits/master",
   "image_url": "https://shields.io/my/badge1",
   "rendered_link_url": "https://gitlab.com/gitlab-org/gitlab-foss/commits/master",
@@ -136,6 +139,7 @@ PUT /groups/:id/badges/:badge_id
 | `badge_id` | integer | yes   | The badge ID |
 | `link_url` | string         | no | URL of the badge link |
 | `image_url` | string | no | URL of the badge image |
+| `name` | string | no | Name of the badge |
 
 ```shell
 curl --request PUT --header "PRIVATE-TOKEN: <your_access_token>" \
@@ -147,6 +151,7 @@ Example response:
 ```json
 {
   "id": 1,
+  "name": "mybadge",
   "link_url": "https://gitlab.com/gitlab-org/gitlab-foss/commits/master",
   "image_url": "https://shields.io/my/badge",
   "rendered_link_url": "https://gitlab.com/gitlab-org/gitlab-foss/commits/master",
diff --git a/doc/api/project_badges.md b/doc/api/project_badges.md
index 5b066bb5bf2..3dad40a3f96 100644
--- a/doc/api/project_badges.md
+++ b/doc/api/project_badges.md
@@ -35,7 +35,7 @@ GET /projects/:id/badges
 | `name`    | string         | no  | Name of the badges to return (case-sensitive). |
 
 ```shell
-curl --header "PRIVATE-TOKEN: <your_access_token>" "https://gitlab.example.com/api/v4/projects/:id/badges"
+curl --header "PRIVATE-TOKEN: <your_access_token>" "https://gitlab.example.com/api/v4/projects/:id/badges?name=Coverage"
 ```
 
 Example response:
@@ -84,6 +84,7 @@ Example response:
 
 ```json
 {
+  "name": "Coverage",
   "id": 1,
   "link_url": "http://example.com/ci_status.svg?project=%{project_path}&ref=%{default_branch}",
   "image_url": "https://shields.io/my/badge",
diff --git a/doc/development/database/index.md b/doc/development/database/index.md
index 5abc7cd3ffa..beae5842199 100644
--- a/doc/development/database/index.md
+++ b/doc/development/database/index.md
@@ -93,6 +93,16 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 - [Troubleshooting PostgreSQL](../../administration/troubleshooting/postgresql.md)
 - [Working with the bundled PgBouncer service](../../administration/postgresql/pgbouncer.md)
 
+## User information for scaling
+
+For GitLab administrators, information about
+[configuring PostgreSQL for scaling](../../administration/postgresql/index.md) is available,
+including the major methods:
+
+- [Standalone PostgreSQL](../../administration/postgresql/standalone.md)
+- [External PostgreSQL instances](../../administration/postgresql/external.md)
+- [Replication and failover](../../administration/postgresql/replication_and_failover.md)
+
 ## Miscellaneous
 
 - [Maintenance operations](maintenance_operations.md)
diff --git a/doc/development/gitaly.md b/doc/development/gitaly.md
index a23f1dd2d80..b4f5501ccac 100644
--- a/doc/development/gitaly.md
+++ b/doc/development/gitaly.md
@@ -219,19 +219,31 @@ as a [CI/CD variable](../ci/variables/index.md).
 
 If you are making changes to the RPC client, such as adding a new endpoint or adding a new
 parameter to an existing endpoint, follow the guide for
-[Gitaly protobuf specifications](https://gitlab.com/gitlab-org/gitaly/blob/master/doc/protobuf.md). After pushing
-the branch with the changes (`new-feature-branch`, for example):
+[Gitaly protobuf specifications](https://gitlab.com/gitlab-org/gitaly/blob/master/doc/protobuf.md). Then:
+
+1. Run `bundle install` in the `tools/protogem` directory of Gitaly.
+1. Build the RPC client gem from the root directory of Gitaly:
+
+   ```shell
+   BUILD_GEM_OPTIONS=--skip-verify-tag make build-proto-gem
+   ```
+
+1. In the `_build` directory of Gitaly, unpack the newly created `.gem` file and create a `gemspec`:
+
+   ```shell
+   gem unpack gitaly.gem &&
+   gem spec gitaly.gem > gitaly/gitaly.gemspec
+   ```
 
 1. Change the `gitaly` line in the Rails' `Gemfile` to:
 
    ```ruby
-   gem 'gitaly', git: 'https://gitlab.com/gitlab-org/gitaly.git', branch: 'new-feature-branch'
+   gem 'gitaly', path: '../gitaly/_build'
    ```
 
 1. Run `bundle install` to use the modified RPC client.
 
-Re-run `bundle install` in the `gitlab` project each time the Gitaly branch
-changes to embed a new SHA in the `Gemfile.lock` file.
+Re-run steps 2-5 each time you want to try out new changes.
 
 ---
 
diff --git a/doc/install/postgresql_extensions.md b/doc/install/postgresql_extensions.md
index ea6de690426..341a822f2bf 100644
--- a/doc/install/postgresql_extensions.md
+++ b/doc/install/postgresql_extensions.md
@@ -1,6 +1,6 @@
 ---
-stage: none
-group: unassigned
+stage: Data Stores
+group: Database
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
 ---
 
diff --git a/doc/topics/offline/quick_start_guide.md b/doc/topics/offline/quick_start_guide.md
index 2903e072508..c67fad32095 100644
--- a/doc/topics/offline/quick_start_guide.md
+++ b/doc/topics/offline/quick_start_guide.md
@@ -208,8 +208,7 @@ Learn more about [disabling usage statistics](../../user/admin_area/settings/usa
 
 ### Configure NTP
 
-In GitLab 15.4 and 15.5, Gitaly Cluster doesn't function if `pool.ntp.org` is unreachable.
-[Customize the time server setting](../../administration/gitaly/praefect.md#customize-time-server-setting) on the Gitaly
+In GitLab 15.4 and 15.5, Gitaly Cluster assumes `pool.ntp.org` is accessible. If `pool.ntp.org` is not accessible, [customize the time server setting](../../administration/gitaly/praefect.md#customize-time-server-setting) on the Gitaly
 and Praefect servers so they can use an accessible NTP server.
 
 On offline instances, the [GitLab Geo check Rake task](../../administration/geo/replication/troubleshooting.md#can-geo-detect-the-current-site-correctly)
diff --git a/doc/user/clusters/agent/vulnerabilities.md b/doc/user/clusters/agent/vulnerabilities.md
index dd277e9627f..a71eea82df5 100644
--- a/doc/user/clusters/agent/vulnerabilities.md
+++ b/doc/user/clusters/agent/vulnerabilities.md
@@ -1,6 +1,6 @@
 ---
-stage: Configure
-group: Configure
+stage: Secure
+group: Composition analysis
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
 ---