Add latest changes from gitlab-org/gitlab@master

17 files changed, 57 insertions, 43 deletions

diff --git a/doc/api/packages/pypi.md b/doc/api/packages/pypi.md
index 1b155feb8b5..4ac83311839 100644
--- a/doc/api/packages/pypi.md
+++ b/doc/api/packages/pypi.md
@@ -28,7 +28,7 @@ is recommended when [FIPS mode](../../development/fips_compliance.md) is enabled
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/225545) in GitLab 13.12.
 
-Download a PyPI package file. The [simple API](#group-level-simple-api-entry-point) 
+Download a PyPI package file. The [simple API](#group-level-simple-api-entry-point)
 usually supplies this URL.
 
 ```plaintext
diff --git a/doc/architecture/blueprints/modular_monolith/proof_of_concepts.md b/doc/architecture/blueprints/modular_monolith/proof_of_concepts.md
index c215ffafbe4..7169e12a7b5 100644
--- a/doc/architecture/blueprints/modular_monolith/proof_of_concepts.md
+++ b/doc/architecture/blueprints/modular_monolith/proof_of_concepts.md
@@ -36,7 +36,7 @@ gRPC would carry messages between modules.
 ## Use Packwerk to enforce module boundaries
 
 Packwerk is a static analyzer that helps defining and enforcing module boundaries
-in Ruby. 
+in Ruby.
 
 [In this PoC merge request](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/98801)
 we demonstrate a possible directory structure of the monolith broken down into separate
diff --git a/doc/ci/components/index.md b/doc/ci/components/index.md
index ae35b3779c3..77de209dc50 100644
--- a/doc/ci/components/index.md
+++ b/doc/ci/components/index.md
@@ -367,7 +367,7 @@ This action is not reversible.
 
 Any existing CI template, that you share with other projects via `include:` syntax, can be converted to a CI component.
 
-1. Decide whether you want the component to be part of an existing [components repository](#components-repository), 
+1. Decide whether you want the component to be part of an existing [components repository](#components-repository),
    if you want to logically group components together. Create and setup a [components repository](#components-repository) otherwise.
 1. Create a YAML file in the components repository according to the expected [directory structure](#directory-structure).
 1. Copy the content of the template YAML file into the new component YAML file.
diff --git a/doc/ci/examples/end_to_end_testing_webdriverio/index.md b/doc/ci/examples/end_to_end_testing_webdriverio/index.md
index ee8b6bb30b6..eb956f66dd7 100644
--- a/doc/ci/examples/end_to_end_testing_webdriverio/index.md
+++ b/doc/ci/examples/end_to_end_testing_webdriverio/index.md
@@ -154,7 +154,7 @@ to interact with your application, so we need to install and run them.
 Furthermore, WebdriverIO uses Selenium as a common interface to control different browsers,
 so we need to install and run Selenium as well. Luckily, the Selenium project provides the Docker images for Firefox
 [standalone-firefox](https://hub.docker.com/r/selenium/standalone-firefox/) and
-and for Chrome [standalone-chrome](https://hub.docker.com/r/selenium/standalone-chrome/). 
+and for Chrome [standalone-chrome](https://hub.docker.com/r/selenium/standalone-chrome/).
 (Since Safari and Internet Explorer/Edge are not open source and
 not available for Linux, we are unfortunately unable to use those in GitLab CI/CD).
 
diff --git a/doc/development/advanced_search.md b/doc/development/advanced_search.md
index 30e1874f1ed..805459cb4ee 100644
--- a/doc/development/advanced_search.md
+++ b/doc/development/advanced_search.md
@@ -52,9 +52,9 @@ during indexing and searching operations. Some of the benefits and tradeoffs to
 - Routing is not used if too many shards would be hit for global and group scoped searches.
 - Shard size imbalance might occur.
 
-## Existing Analyzers/Tokenizers/Filters
+## Existing analyzers and tokenizers
 
-These are all defined in [`ee/lib/elastic/latest/config.rb`](https://gitlab.com/gitlab-org/gitlab/-/blob/master/ee/lib/elastic/latest/config.rb)
+The following analyzers and tokenizers are defined in [`ee/lib/elastic/latest/config.rb`](https://gitlab.com/gitlab-org/gitlab/-/blob/master/ee/lib/elastic/latest/config.rb).
 
 ### Analyzers
 
@@ -72,7 +72,7 @@ Please see the `sha_tokenizer` explanation later below for an example.
 
 #### `code_analyzer`
 
-Used when indexing a blob's filename and content. Uses the `whitespace` tokenizer and the filters: [`code`](#code), `lowercase`, and `asciifolding`
+Used when indexing a blob's filename and content. Uses the `whitespace` tokenizer and the [`word_delimiter_graph`](https://www.elastic.co/guide/en/elasticsearch/reference/current/analysis-word-delimiter-graph-tokenfilter.html), `lowercase`, and `asciifolding` filters.
 
 The `whitespace` tokenizer was selected to have more control over how tokens are split. For example the string `Foo::bar(4)` needs to generate tokens like `Foo` and `bar(4)` to be properly searched.
 
@@ -81,10 +81,6 @@ Please see the `code` filter for an explanation on how tokens are split.
 NOTE:
 The [Elasticsearch `code_analyzer` doesn't account for all code cases](../integration/advanced_search/elasticsearch_troubleshooting.md#elasticsearch-code_analyzer-doesnt-account-for-all-code-cases).
 
-#### `code_search_analyzer`
-
-Not directly used for indexing, but rather used to transform a search input. Uses the `whitespace` tokenizer and the `lowercase` and `asciifolding` filters.
-
 ### Tokenizers
 
 #### `sha_tokenizer`
@@ -115,27 +111,10 @@ Example:
 - `'path/application.js'`
 - `'application.js'`
 
-### Filters
-
-#### `code`
-
-Uses a [Pattern Capture token filter](https://www.elastic.co/guide/en/elasticsearch/reference/5.5/analysis-pattern-capture-tokenfilter.html) to split tokens into more easily searched versions of themselves.
-
-Patterns:
-
-- `"(\\p{Ll}+|\\p{Lu}\\p{Ll}+|\\p{Lu}+)"`: captures CamelCase and lowerCamelCase strings as separate tokens
-- `"(\\d+)"`: extracts digits
-- `"(?=([\\p{Lu}]+[\\p{L}]+))"`: captures CamelCase strings recursively. For example: `ThisIsATest` => `[ThisIsATest, IsATest, ATest, Test]`
-- `'"((?:\\"|[^"]|\\")*)"'`: captures terms inside quotes, removing the quotes
-- `"'((?:\\'|[^']|\\')*)'"`: same as above, for single-quotes
-- `'\.([^.]+)(?=\.|\s|\Z)'`: separate terms with periods in-between
-- `'([\p{L}_.-]+)'`: some common chars in file names to keep the whole filename intact (for example `my_file-ñame.txt`)
-- `'([\p{L}\d_]+)'`: letters, numbers and underscores are the most common tokens in programming. Always capture them greedily regardless of context.
-
 ## Gotchas
 
-- Searches can have their own analyzers. Remember to check when editing analyzers
-- `Character` filters (as opposed to token filters) always replace the original character, so they're not a good choice as they can hinder exact searches
+- Searches can have their own analyzers. Remember to check when editing analyzers.
+- `Character` filters (as opposed to token filters) always replace the original character. These filters can hinder exact searches.
 
 ## Zero downtime reindexing with multiple indices
 
diff --git a/doc/development/deprecation_guidelines/index.md b/doc/development/deprecation_guidelines/index.md
index af89da5ec65..d586f25ffbf 100644
--- a/doc/development/deprecation_guidelines/index.md
+++ b/doc/development/deprecation_guidelines/index.md
@@ -45,7 +45,7 @@ For versioning and upgrade details, see our [Release and Maintenance policy](../
 
 GitLab self-managed packages are semantically versioned and follow our [maintenance policy](../../policy/maintenance.md). This process applies to features and APIs that are generally available, not beta or experimental.
 
-This maintenance policy is in place to allow our customers to prepare for disruptive changes by establishing a clear and predictable pattern that is widely used in the software industry. For many of our customers, GitLab is a business-critical application and surprising changes can cause damages and erode trust. 
+This maintenance policy is in place to allow our customers to prepare for disruptive changes by establishing a clear and predictable pattern that is widely used in the software industry. For many of our customers, GitLab is a business-critical application and surprising changes can cause damages and erode trust.
 
 Introducing breaking changes in minor releases is against policy because it can disrupt our customers and introduces an element of randomness that requires customers to check for breaking changes every minor release to ensure that their business is not impacted. This does not align with our goal [to make it as easy as possible for customers to do business with GitLab](https://about.gitlab.com/company/yearlies/#fy24-yearlies) and is strongly discouraged.
 
diff --git a/doc/development/documentation/topic_types/index.md b/doc/development/documentation/topic_types/index.md
index 3f055ca7ed7..40039ca5b1a 100644
--- a/doc/development/documentation/topic_types/index.md
+++ b/doc/development/documentation/topic_types/index.md
@@ -47,7 +47,7 @@ In general, for topic titles:
 - Follow [capitalization](../styleguide/index.md#topic-titles) guidelines.
 - Do not repeat text from earlier topic titles. For example, if the page is about merge requests,
   instead of `Troubleshooting merge requests`, use only `Troubleshooting`.
-- Avoid using hyphens to separate information. 
+- Avoid using hyphens to separate information.
   For example, instead of `Internal analytics - Architecture`, use `Internal analytics architecture` or `Architecture of internal analytics`.
 
 See also [guidelines for heading levels in Markdown](../styleguide/index.md#heading-levels-in-markdown).
diff --git a/doc/development/gems.md b/doc/development/gems.md
index 57acac7287b..9259e9f7d50 100644
--- a/doc/development/gems.md
+++ b/doc/development/gems.md
@@ -13,7 +13,7 @@ We extract libraries from our codebase when their functionality
 is highly isolated and we want to use them in other applications
 ourselves or we think it would benefit the wider community.
 
-Extracting code to a gem also ensures that the gem does not contain any hidden 
+Extracting code to a gem also ensures that the gem does not contain any hidden
 dependencies on our application code.
 
 Gems should always be used when implementing functionality that can be considered isolated,
@@ -36,7 +36,7 @@ You can always start by creating a new Gem [in the same repo](#in-the-same-repo)
 to be used by a wider community.
 
 WARNING:
-To prevent malicious actors from name-squatting the extracted Gems, follow the instructions 
+To prevent malicious actors from name-squatting the extracted Gems, follow the instructions
 to [reserve a gem name](#reserve-a-gem-name).
 
 ## Advantages of using Gems
@@ -81,7 +81,7 @@ and prevents complexity (coordinating changes across repos, new permissions, mul
 Gems stored in the same repo should be referenced in `Gemfile` with the `path:` syntax.
 
 WARNING:
-To prevent malicious actors from name-squatting the extracted Gems, follow the instructions 
+To prevent malicious actors from name-squatting the extracted Gems, follow the instructions
 to [reserve a gem name](#reserve-a-gem-name).
 
 ### Create and use a new Gem
diff --git a/doc/development/geo.md b/doc/development/geo.md
index a39f97f1241..e8eb19b1572 100644
--- a/doc/development/geo.md
+++ b/doc/development/geo.md
@@ -680,7 +680,7 @@ on, check out our [self-service framework](geo/framework.md).
 
 After triggering a successful [e2e:package-and-test-ee](testing_guide/end_to_end/index.md#using-the-package-and-test-job) pipeline, you can manually trigger a job named `GET:Geo`:
 
-1. In the [GitLab project](https://gitlab.com/gitlab-org/gitlab), select the **Pipelines** tab of a merge request. 
+1. In the [GitLab project](https://gitlab.com/gitlab-org/gitlab), select the **Pipelines** tab of a merge request.
 1. Select the `Stage: qa` stage on the latest pipeline to expand and list all the related jobs.
 1. Select `trigger-omnibus` to view the [Omnibus GitLab Mirror](https://gitlab.com/gitlab-org/build/omnibus-gitlab-mirror) pipeline corresponding to the merge request.
 1. The `GET:Geo` job can be found and triggered under the `trigger-qa` stage.
diff --git a/doc/development/integrations/secure.md b/doc/development/integrations/secure.md
index 09778127050..fa8392b5580 100644
--- a/doc/development/integrations/secure.md
+++ b/doc/development/integrations/secure.md
@@ -577,7 +577,7 @@ All other attributes are optional.
 
 ##### SAST
 
-The `location` of a SAST vulnerability must have a `file` that gives the path of the affected file and 
+The `location` of a SAST vulnerability must have a `file` that gives the path of the affected file and
 a `start_line` field with the affected line number.
 It may also have an `end_line`, a `class`, and a `method`.
 
diff --git a/doc/development/internal_analytics/snowplow/troubleshooting.md b/doc/development/internal_analytics/snowplow/troubleshooting.md
index 2f59543e0f4..c085ceb0f56 100644
--- a/doc/development/internal_analytics/snowplow/troubleshooting.md
+++ b/doc/development/internal_analytics/snowplow/troubleshooting.md
@@ -42,7 +42,7 @@ or even a result of a public holiday in some regions of the world with a larger
 1. Check (via [Grafana explore tab](https://dashboards.gitlab.net/explore) ) following Prometheus counters `gitlab_snowplow_events_total`, `gitlab_snowplow_failed_events_total` and `gitlab_snowplow_successful_events_total` to see how many events were fired correctly from GitLab.com. Example query to use `sum(rate(gitlab_snowplow_successful_events_total{env="gprd"}[5m])) / sum(rate(gitlab_snowplow_events_total{env="gprd"}[5m]))` would chart rate at which number of good events rose in comparison to events sent in total. If number drops from 1 it means that problem might be in communication between GitLab and AWS collectors fleet.
 1. Check [logs in Kibana](https://log.gprd.gitlab.net/app/discover#) and filter with `{ "query": { "match_phrase": { "json.message": "failed to be reported to collector at" } } }` if there are some failed events logged
 
-We conducted an investigation into an unexpected drop in snowplow events volume. 
+We conducted an investigation into an unexpected drop in snowplow events volume.
 
 GitLab team members can view more information in this confidential issue: `https://gitlab.com/gitlab-org/gitlab/-/issues/335206`
 
diff --git a/doc/subscriptions/choosing_subscription.md b/doc/subscriptions/choosing_subscription.md
index ccb68792531..ad42eecc9c1 100644
--- a/doc/subscriptions/choosing_subscription.md
+++ b/doc/subscriptions/choosing_subscription.md
@@ -30,7 +30,7 @@ A new subscription must be purchased and applied as needed.
 ## Choose a GitLab tier
 
 Pricing is [tier-based](https://about.gitlab.com/pricing/), allowing you to choose
-the features that fit your budget. 
+the features that fit your budget.
 
 For more details, see
 [a comparison of self-managed features available in each tier](https://about.gitlab.com/pricing/feature-comparison/).
diff --git a/doc/user/application_security/dast/proxy-based.md b/doc/user/application_security/dast/proxy-based.md
index 0eec04bfeff..6d36abf25cf 100644
--- a/doc/user/application_security/dast/proxy-based.md
+++ b/doc/user/application_security/dast/proxy-based.md
@@ -501,7 +501,7 @@ To run an existing on-demand scan:
 1. In the scan's row, select **Run scan**.
 
    If the branch saved in the scan no longer exists, you must:
-   
+
    1. [Edit the scan](#edit-an-on-demand-scan).
    1. Select a new branch.
    1. Save the edited scan.
diff --git a/doc/user/application_security/vulnerabilities/severities.md b/doc/user/application_security/vulnerabilities/severities.md
index 9553d15bbe9..605fef39090 100644
--- a/doc/user/application_security/vulnerabilities/severities.md
+++ b/doc/user/application_security/vulnerabilities/severities.md
@@ -22,7 +22,7 @@ GitLab analyzers make an effort to fit the severity descriptions below, but they
 
 ## Critical severity
 
-Vulnerabilities identified at the Critical Severity level should be investigated immediately. Vulnerabilities at this level assume exploitation of the flaw could lead to full system or data compromise. Examples of critical severity flaws are Command/Code Injection and SQL Injection. Typically these flaws are rated with CVSS 3.1 between 9.0-10.0. 
+Vulnerabilities identified at the Critical Severity level should be investigated immediately. Vulnerabilities at this level assume exploitation of the flaw could lead to full system or data compromise. Examples of critical severity flaws are Command/Code Injection and SQL Injection. Typically these flaws are rated with CVSS 3.1 between 9.0-10.0.
 
 ## High severity
 
diff --git a/doc/user/group/index.md b/doc/user/group/index.md
index 7ff9648e41e..654fe928cd4 100644
--- a/doc/user/group/index.md
+++ b/doc/user/group/index.md
@@ -63,6 +63,24 @@ This page shows groups that you are a member of:
 - Through membership of a subgroup's parent group.
 - Through direct or inherited membership of a project in the group or subgroup.
 
+## View group activity
+
+To view the activity of a project:
+
+1. On the left sidebar, at the top, select **Search GitLab** (**{search}**) to find your group.
+1. Select **Manage > Activity**.
+1. Optional. To filter activity by contribution type, select a tab:
+
+   - **All**: All contributions by group members in the group and group's projects.
+   - **Push events**: Push events in the group's projects.
+   - **Merge events**: Accepted merge requests in the group's projects.
+   - **Issue events**: Issues opened and closed in the group's projects.
+   - **Epic events**: Epics opened and closed in the group.
+   - **Comments**: Comments posted by group members in the group's projects.
+   - **Wiki**: Updates to wiki pages in the group.
+   - **Designs**: Designs added, updated, and removed in the group's projects.
+   - **Team**: Group members who joined and left the group's projects.
+
 ## Create a group
 
 To create a group:
diff --git a/doc/user/profile/index.md b/doc/user/profile/index.md
index fa83f0dab05..02653591da5 100644
--- a/doc/user/profile/index.md
+++ b/doc/user/profile/index.md
@@ -354,7 +354,16 @@ To view your activity:
 1. On the left sidebar, expand the top-most chevron (**{chevron-down}**).
 1. Select **Your work**.
 1. Select **Activity**.
-1. Optional. To filter your activity by contribution type, in the **Your Activity** tab, select a tab.
+1. Optional. To filter your activity by contribution type, in the **Your Activity** tab, select a tab:
+
+   - **All**: All contributions you made in your groups and projects.
+   - **Push events**: Push events you made in your projects.
+   - **Merge events**: Merge requests you accepted in your projects.
+   - **Issue events**: Issues you opened and closed in your projects.
+   - **Comments**: Comments you posted in your projects.
+   - **Wiki**: Wiki pages you created and updated in your projects.
+   - **Designs**: Designs you added, updated, and removed in your projects.
+   - **Team**: Projects you joined and left.
 
 ## Session duration
 
diff --git a/doc/user/project/working_with_projects.md b/doc/user/project/working_with_projects.md
index 472bbb81648..fc6e6d8d314 100644
--- a/doc/user/project/working_with_projects.md
+++ b/doc/user/project/working_with_projects.md
@@ -178,7 +178,15 @@ To view the activity of a project:
 
 1. On the left sidebar, at the top, select **Search GitLab** (**{search}**) to find your project.
 1. Select **Manage > Activity**.
-1. Select a tab to view the type of project activity.
+1. Optional. To filter activity by contribution type, select a tab:
+
+   - **All**: All contributions by project members.
+   - **Push events**: Push events in the project.
+   - **Merge events**: Accepted merge requests in the project.
+   - **Issue events**: Issues opened and closed in the project.
+   - **Comments**: Comments posted by project members.
+   - **Designs**: Designs added, updated, and removed in the project.
+   - **Team**: Members who joined and left the project.
 
 ## Search in projects