Add latest changes from gitlab-org/gitlab@master

3 files changed, 15 insertions, 9 deletions

diff --git a/doc/development/rails_update.md b/doc/development/rails_update.md
index 32295cc0e43..772206c2d73 100644
--- a/doc/development/rails_update.md
+++ b/doc/development/rails_update.md
@@ -4,11 +4,11 @@ group: unassigned
 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
 ---
 
-# Rails update guidelines
+# Rails upgrade guidelines
 
 We strive to run GitLab using the latest Rails releases to benefit from performance, security updates, and new features.
 
-## Rails update approach
+## Rails upgrade approach
 
 1. [Prepare an MR for GitLab](#prepare-an-mr-for-gitlab).
 1. [Prepare an MR for Gitaly](#prepare-an-mr-for-gitaly).
@@ -40,7 +40,7 @@ We strive to run GitLab using the latest Rails releases to benefit from performa
 
 ### Create patch releases and backports for security patches
 
-If the Rails update was over a patch release and it contains important security fixes,
+If the Rails upgrade was over a patch release and it contains important security fixes,
 make sure to release it in a
 GitLab patch release to self-managed customers. Consult with our [release managers](https://about.gitlab.com/community/release-managers/)
 for how to proceed.
diff --git a/doc/operations/incident_management/integrations.md b/doc/operations/incident_management/integrations.md
index e067e18c64c..2a9b3c9862d 100644
--- a/doc/operations/incident_management/integrations.md
+++ b/doc/operations/incident_management/integrations.md
@@ -101,7 +101,7 @@ parameters. All fields are optional. If the incoming alert does not contain a va
 | `monitoring_tool`         | String          | The name of the associated monitoring tool. |
 | `hosts`                   | String or Array | One or more hosts, as to where this incident occurred. |
 | `severity`                | String          | The severity of the alert. Case-insensitive. Can be one of: `critical`, `high`, `medium`, `low`, `info`, `unknown`. Defaults to `critical` if missing or value is not in this list. |
-| `fingerprint`             | String or Array | The unique identifier of the alert. This can be used to group occurrences of the same alert. |
+| `fingerprint`             | String or Array | The unique identifier of the alert. This can be used to group occurrences of the same alert. When the `generic_alert_fingerprinting` feature is enabled, the fingerprint is generated automatically based on the payload (excluding the `start_time`, `end_time`, and `hosts` parameters). |
 | `gitlab_environment_name` | String          | The name of the associated GitLab [environment](../../ci/environments/index.md). Required to [display alerts on a dashboard](../../user/operations_dashboard/index.md#adding-a-project-to-the-dashboard). |
 
 You can also add custom fields to the alert's payload. The values of extra
diff --git a/doc/user/project/repository/code_suggestions.md b/doc/user/project/repository/code_suggestions.md
index 5088204b53a..c03fb4dde92 100644
--- a/doc/user/project/repository/code_suggestions.md
+++ b/doc/user/project/repository/code_suggestions.md
@@ -283,14 +283,20 @@ Your personal access token enables a secure API connection to GitLab.com.
 This API connection securely transmits a context window from your IDE/editor to the Code Suggestions GitLab hosted service which calls Google Vertex AI Codey APIs,
 and the generated suggestion is transmitted back to your IDE/editor.
 
-GitLab currently leverages [Google Cloud's Vertex AI Codey API models](https://cloud.google.com/vertex-ai/docs/generative-ai/code/code-models-overview).
+GitLab currently leverages [Google Cloud's Vertex AI Codey API models](https://cloud.google.com/vertex-ai/docs/generative-ai/code/code-models-overview). Learn more about Google Vertex AI Codey APIs [Data Governance](https://cloud.google.com/vertex-ai/docs/generative-ai/data-governance).
 
-### Data privacy
+### Telemetry
 
-No new additional data is collected to enable this feature. Private non-public GitLab customer data is
-not used as training data.
+For self-managed instances that have enabled Code Suggestions and SaaS accounts, we collect aggregated or de-identified first-party usage data through our [Snowplow collector](https://about.gitlab.com/handbook/business-technology/data-team/platform/snowplow/). This usage data includes the following metrics:
 
-Learn more about Google Vertex AI Codey APIs [Data Governance](https://cloud.google.com/vertex-ai/docs/generative-ai/data-governance)
+- Language the code suggestion was in (for example, Python)
+- Editor being used (for example, VS Code)
+- Number of suggestions shown, accepted, rejected, or that had errors
+- Duration of time that a suggestion was shown
+- Prompt and suffix lengths
+- Model used
+- Number of unique users
+- Number of unique instances
 
 ### Inference window context