Add latest changes from gitlab-org/gitlab@master

2 files changed, 4 insertions, 1 deletions

diff --git a/doc/user/product_analytics/instrumentation/browser_sdk.md b/doc/user/product_analytics/instrumentation/browser_sdk.md
index 3ab7e2750e1..66865ab37f1 100644
--- a/doc/user/product_analytics/instrumentation/browser_sdk.md
+++ b/doc/user/product_analytics/instrumentation/browser_sdk.md
@@ -83,7 +83,7 @@ interface GitLabClientSDKOptions {
 | :---------------------------- | :---------- |
 | `appId`                       | The ID provided by the GitLab Project Analytics setup guide. This ID ensures your data is sent to your analytics instance. |
 | `host`                        | The GitLab Project Analytics instance provided by the setup guide. |
-| `hasCookieConsent`            | Whether to use cookies to identify unique users and record their full IP address. Set to `false` by default. When `false`, users are considered anonymous users. No cookies or other storage mechanisms are used to identify users. |
+| `hasCookieConsent`            | Whether to use cookies to identify unique users. Set to `false` by default. When `false`, users are considered anonymous users. No cookies or other storage mechanisms are used to identify users. |
 | `respectGlobalPrivacyControl` | Whether to respect the user's [GPC](https://globalprivacycontrol.org/) configuration to permit or refuse tracking. Set to `true` by default. When `false`, events are emitted regardless of user configuration. |
 | `trackerId`                   | Used to differentiate between multiple trackers running on the same page or application, because each tracker instance can be configured differently to capture different sets of data. This identifier helps ensure that the data sent to the collector is correctly associated with the correct tracker configuration. Default value is `gitlab`. |
 | `pagePingTracking`            | Option to track user engagement on your website or application by sending periodic events while a user is actively browsing a page. Page pings provide valuable insight into how users interact with your content, such as how long they spend on a page, which sections they are viewing, and whether they are scrolling. `pagePingTracking` can be boolean or an object. As a boolean, set to `true` it enables page ping with default options, and set to `false` it disables page ping tracking. As an object, it has two options: `minimumVisitLength` (the minimum time that must have elapsed before the first heartbeat) and `heartbeatDelay` (the interval at which the callback is fired). |
diff --git a/doc/user/project/protected_branches.md b/doc/user/project/protected_branches.md
index f957a5ae2c0..2ec92fbb52f 100644
--- a/doc/user/project/protected_branches.md
+++ b/doc/user/project/protected_branches.md
@@ -43,6 +43,9 @@ When a branch is protected, the default behavior enforces these restrictions on
    for that branch at the project level are ignored. All other protections continue
    to use project level settings.
 
+You can implement a [scan result policy](../application_security/policies/scan-result-policies.md#approval_settings)
+to prevent protected branches being unprotected or deleted.
+
 ### When a branch matches multiple rules
 
 When a branch matches multiple rules, the **most permissive rule** determines the