Add latest changes from gitlab-org/gitlab@master

.gitlab/ci/rules.gitlab-ci.yml

@@ -401,7 +401,7 @@
   - "scripts/rspec_helpers.sh"
   # Mapped patterns (see tests.yml)
   - "data/whats_new/*.yml"
-  - "doc/index.md"
+  - "doc/_index.md"
   - "doc/api/settings.md"
 
 .search-backend-patterns: &search-backend-patterns
@@ -508,7 +508,7 @@
   - "{,jh/}.gitlab/ci/**/*"
   # Mapped patterns (see tests.yml)
   - "data/whats_new/*.yml"
-  - "doc/index.md"
+  - "doc/_index.md"
   - "doc/api/settings.md"
 
 # .code-patterns + .backstage-patterns
@@ -537,7 +537,7 @@
   - "{,jh/}.gitlab/ci/**/*"
   # Mapped patterns (see tests.yml)
   - "data/whats_new/*.yml"
-  - "doc/index.md"
+  - "doc/_index.md"
   - "doc/api/settings.md"
   # Backstage changes
   - "Dangerfile"
@@ -574,7 +574,7 @@
   - "{,jh/}.gitlab/ci/**/*"
   # Mapped patterns (see tests.yml)
   - "data/whats_new/*.yml"
-  - "doc/index.md"
+  - "doc/_index.md"
   - "doc/api/settings.md"
   # QA changes
   - ".dockerignore"
@@ -617,7 +617,7 @@
   - "{,jh/}qa/**/*"
   # Mapped patterns (see tests.yml)
   - "data/whats_new/*.yml"
-  - "doc/index.md"
+  - "doc/_index.md"
   - "doc/api/settings.md"
 
 # .code-backstage-qa-patterns + .workhorse-patterns
@@ -649,7 +649,7 @@
   - "{,jh/}.gitlab/ci/**/*"
   # Mapped patterns (see tests.yml)
   - "data/whats_new/*.yml"
-  - "doc/index.md"
+  - "doc/_index.md"
   - "doc/api/settings.md"
   # Backstage changes
   - "Dangerfile"

app/assets/javascripts/groups/constants.js

 import { __, s__ } from '~/locale';
+import {
+  SORT_LABEL_NAME,
+  SORT_LABEL_CREATED,
+  SORT_LABEL_UPDATED,
+  SORT_LABEL_STARS,
+} from '~/groups_projects/constants';
 
 export const MAX_CHILDREN_COUNT = 20;
 
@@ -23,25 +29,25 @@ export const ITEM_TYPE = {
 };
 
 export const SORTING_ITEM_NAME = {
-  label: __('Name'),
+  label: SORT_LABEL_NAME,
   asc: 'name_asc',
   desc: 'name_desc',
 };
 
 export const SORTING_ITEM_CREATED = {
-  label: __('Created date'),
+  label: SORT_LABEL_CREATED,
   asc: 'created_asc',
   desc: 'created_desc',
 };
 
 export const SORTING_ITEM_UPDATED = {
-  label: __('Updated date'),
+  label: SORT_LABEL_UPDATED,
   asc: 'latest_activity_asc',
   desc: 'latest_activity_desc',
 };
 
 export const SORTING_ITEM_STARS = {
-  label: __('Stars'),
+  label: SORT_LABEL_STARS,
   asc: 'stars_asc',
   desc: 'stars_desc',
 };

app/assets/javascripts/groups_projects/constants.js

+import { __ } from '~/locale';
+
+export const SORT_LABEL_NAME = __('Name');
+export const SORT_LABEL_CREATED = __('Created date');
+export const SORT_LABEL_UPDATED = __('Updated date');
+export const SORT_LABEL_STARS = __('Stars');

app/assets/javascripts/organizations/shared/constants.js

 import { formValidators } from '@gitlab/ui/dist/utils';
 import { s__, __ } from '~/locale';
+import {
+  SORT_LABEL_NAME,
+  SORT_LABEL_CREATED,
+  SORT_LABEL_UPDATED,
+} from '~/groups_projects/constants';
 
 export const RESOURCE_TYPE_GROUPS = 'groups';
 export const RESOURCE_TYPE_PROJECTS = 'projects';
@@ -51,15 +56,15 @@ export const SORT_UPDATED_AT = 'updated_at';
 
 export const SORT_ITEM_NAME = {
   value: SORT_NAME,
-  text: __('Name'),
+  text: SORT_LABEL_NAME,
 };
 
 export const SORT_ITEM_CREATED_AT = {
   value: SORT_CREATED_AT,
-  text: __('Created'),
+  text: SORT_LABEL_CREATED,
 };
 
 export const SORT_ITEM_UPDATED_AT = {
   value: SORT_UPDATED_AT,
-  text: __('Updated'),
+  text: SORT_LABEL_UPDATED,
 };

app/assets/javascripts/projects/filtered_search_and_sort/constants.js

-import { __ } from '~/locale';
+import {
+  SORT_LABEL_NAME,
+  SORT_LABEL_CREATED,
+  SORT_LABEL_UPDATED,
+  SORT_LABEL_STARS,
+} from '~/groups_projects/constants';
 
 export const SORT_OPTION_NAME = {
   value: 'name',
-  text: __('Name'),
+  text: SORT_LABEL_NAME,
 };
 
 export const SORT_OPTION_CREATED = {
   value: 'created',
-  text: __('Created'),
+  text: SORT_LABEL_CREATED,
 };
 
 export const SORT_OPTION_UPDATED = {
   value: 'latest_activity',
-  text: __('Updated'),
+  text: SORT_LABEL_UPDATED,
 };
 
 export const SORT_OPTION_STARS = {
   value: 'stars',
-  text: __('Stars'),
+  text: SORT_LABEL_STARS,
 };
 
 export const SORT_DIRECTION_ASC = 'asc';

app/assets/javascripts/super_sidebar/components/help_center.vue

@@ -88,7 +88,7 @@ export default {
             },
             {
               text: this.$options.i18n.contribute,
-              href: helpPagePath('', { anchor: 'contribute-to-gitlab' }),
+              href: helpPagePath('_index.md', { anchor: 'contribute-to-gitlab' }),
               extraAttrs: {
                 ...this.trackingAttrs('contribute_to_gitlab'),
               },

doc/administration/docs_self_host.md

@@ -26,7 +26,7 @@ To host the GitLab product documentation, you can use:
 - GitLab Pages
 - Your own web server
 
-The following examples use GitLab 16.0, but make sure to use the version that
+The following examples use GitLab 17.8, but make sure to use the version that
 corresponds to your GitLab instance.
 
 ### Self-host the product documentation with Docker
@@ -47,7 +47,7 @@ To run the GitLab product documentation website in a Docker container:
    - If you use plain Docker, run:
 
      ```shell
-     docker run --detach --name gitlab_docs -it --rm -p 4000:4000 registry.gitlab.com/gitlab-org/gitlab-docs/archives:16.0
+     docker run --detach --name gitlab_docs -it --rm -p 4000:4000 registry.gitlab.com/gitlab-org/technical-writing/docs-gitlab-com/archives:17.8
      ```
 
    - If you host your GitLab instance using
@@ -58,7 +58,7 @@ To run the GitLab product documentation website in a Docker container:
      version: '3.6'
      services:
        gitlab_docs:
-         image: registry.gitlab.com/gitlab-org/gitlab-docs/archives:16.0
+         image: registry.gitlab.com/gitlab-org/technical-writing/docs-gitlab-com/archives:17.8
          hostname: 'https://docs.gitlab.example.com:4000'
          ports:
            - '4000:4000'
@@ -93,7 +93,7 @@ To host the product documentation site with GitLab Pages:
 
    ```yaml
    pages:
-     image: registry.gitlab.com/gitlab-org/gitlab-docs/archives:16.0
+     image: registry.gitlab.com/gitlab-org/technical-writing/docs-gitlab-com/archives:17.8
      script:
        - mkdir public
        - cp -a /usr/share/nginx/html/* public/
@@ -116,8 +116,8 @@ To host the product documentation site with GitLab Pages:
 
 NOTE:
 The website you create must be hosted under a subdirectory that matches
-your installed GitLab version (for example, `16.0/`). The
-[Docker images](https://gitlab.com/gitlab-org/gitlab-docs/container_registry/3631228)
+your installed GitLab version (for example, `17.8/`). The
+[Docker images](https://gitlab.com/gitlab-org/technical-writing/docs-gitlab-com/container_registry/8244403)
 use this version by default.
 
 Because the product documentation site is static, you can take the contents of
@@ -127,22 +127,22 @@ the documentation wherever you want.
 The `html` directory should be served as is and it has the following structure:
 
 ```plaintext
-├── 16.0/
+├── 17.8/
 ├── index.html
 ```
 
 In this example:
 
-- `16.0/` is the directory where the documentation is hosted.
+- `17.8/` is the directory where the documentation is hosted.
 - `index.html` is a simple HTML file that redirects to the directory containing the documentation. In this
-  case, `16.0/`.
+  case, `17.8/`.
 
 To extract the HTML files of the documentation site:
 
 1. Create the container that holds the HTML files of the documentation website:
 
    ```shell
-   docker create -it --name gitlab_docs registry.gitlab.com/gitlab-org/gitlab-docs/archives:16.0
+   docker create -it --name gitlab_docs registry.gitlab.com/gitlab-org/technical-writing/docs-gitlab-com/archives:17.8
    ```
 
 1. Copy the website under `/srv/gitlab/`:
@@ -172,12 +172,12 @@ name as the documentation URL. For example, if you used the
 
 You don't need to append the version. GitLab detects it and appends it to
 documentation URL requests as needed. For example, if your GitLab version is
-16.0:
+17.8:
 
-- The GitLab documentation URL becomes `http://0.0.0.0:4000/16.0/`.
+- The GitLab documentation URL becomes `http://0.0.0.0:4000/17.8/`.
 - The link in GitLab displays as `<instance_url>/help/administration/settings/help_page#destination-requirements`.
 - When you select the link, you are redirected to
-  `http://0.0.0.0:4000/16.0/ee/administration/settings/help_page/#destination-requirements`.
+  `http://0.0.0.0:4000/17.8/administration/settings/help_page/#destination-requirements`.
 
 To test the setting, in GitLab, select a **Learn more** link. For example:
 
@@ -207,21 +207,21 @@ To upgrade to a later version [using Docker](#self-host-the-product-documentatio
      sudo docker rm gitlab_docs
      ```
 
-  1. Pull the new image. For example, 16.0:
+  1. Pull the new image. For example, 17.8:
 
      ```shell
-     docker run --detach --name gitlab_docs -it --rm -p 4000:4000 registry.gitlab.com/gitlab-org/gitlab-docs/archives:16.0
+     docker run --detach --name gitlab_docs -it --rm -p 4000:4000 registry.gitlab.com/gitlab-org/technical-writing/docs-gitlab-com/archives:17.8
      ```
 
 - If you use Docker Compose:
 
-  1. Change the version in `docker-compose.yaml`, for example 16.0:
+  1. Change the version in `docker-compose.yaml`, for example 17.8:
 
      ```yaml
      version: '3.6'
      services:
        gitlab_docs:
-         image: registry.gitlab.com/gitlab-org/gitlab-docs/archives:16.0
+         image: registry.gitlab.com/gitlab-org/technical-writing/docs-gitlab-com/archives:17.8
          hostname: 'https://docs.gitlab.example.com:4000'
          ports:
            - '4000:4000'
@@ -240,7 +240,7 @@ To upgrade to a later version [using GitLab Pages](#self-host-the-product-docume
 1. Edit your existing `.gitlab-ci.yml` file, and replace the `image` version number:
 
    ```yaml
-   image: registry.gitlab.com/gitlab-org/gitlab-docs/archives:16.0
+   image: registry.gitlab.com/gitlab-org/technical-writing/docs-gitlab-com/archives:17.8
    ```
 
 1. Commit the changes, push, and GitLab Pages pulls the new documentation site version.
@@ -252,7 +252,7 @@ To upgrade to a later version [using your own web-server](#self-host-the-product
 1. Copy the HTML files of the documentation site:
 
    ```shell
-   docker create -it --name gitlab_docs registry.gitlab.com/gitlab-org/gitlab-docs/archives:16.0
+   docker create -it --name gitlab_docs registry.gitlab.com/gitlab-org/technical-writing/docs-gitlab-com/archives:17.8
    docker cp gitlab_docs:/usr/share/nginx/html /srv/gitlab/
    docker rm -f gitlab_docs
    ```
@@ -260,7 +260,7 @@ To upgrade to a later version [using your own web-server](#self-host-the-product
 1. Optional. Remove the old site:
 
    ```shell
-   rm -r /srv/gitlab/html/16.0/
+   rm -r /srv/gitlab/html/17.8/
    ```
 
 ## Troubleshooting
@@ -270,17 +270,8 @@ To upgrade to a later version [using your own web-server](#self-host-the-product
 Local search is included in versions 15.6 and later. If you're using an earlier
 version, the search doesn't work.
 
-Those images are pushed to a [separate repository in the container registry](https://gitlab.com/gitlab-org/gitlab-docs/container_registry/3631228).
-
-If you want to have a local search, make sure you use the Docker image the contains
-`archives` in its name, for example:
-
-```plaintext
-registry.gitlab.com/gitlab-org/gitlab-docs/archives:16.0
-```
-
 For more information, read about the
-[different types of searches](https://gitlab.com/gitlab-org/gitlab-docs/-/blob/main/doc/search.md)
+[different types of searches](https://gitlab.com/gitlab-org/technical-writing/docs-gitlab-com/-/blob/main/doc/search.md)
 GitLab Docs are using.
 
 ### The Docker image is not found
@@ -293,3 +284,12 @@ For example:
 ```plaintext
 registry.gitlab.com/gitlab-org/gitlab-docs:15.5
 ```
+
+If you are using version 17.8 or earlier, Docker images are in the
+`gitlab-docs` project.
+
+For example:
+
+```plaintext
+registry.gitlab.com/gitlab-org/gitlab-docs:17.2
+```

doc/administration/get_started.md

@@ -231,7 +231,7 @@ If you use GitLab SaaS, you have several channels with which to get support and
 
 To get assistance for GitLab SaaS:
 
-- Access [GitLab Docs](../index.md) for self-service support.
+- Access [GitLab Docs](../_index.md) for self-service support.
 - Join the [GitLab Forum](https://forum.gitlab.com/) for community support.
 - Gather [your subscription information](https://about.gitlab.com/support/#for-self-managed-users) before submitting a ticket.
 - Submit a support ticket for:

doc/development/documentation/help.md

@@ -156,5 +156,5 @@ Do not use `include ActionView::Helpers::UrlHelper` just to make the `link_to` m
 ## `/help` tests
 
 Several [RSpec tests](https://gitlab.com/gitlab-org/gitlab/-/blob/master/spec/features/help_pages_spec.rb)
-are run to ensure GitLab documentation renders and works correctly. In particular, that [main docs landing page](../../index.md) works correctly from `/help`.
+are run to ensure GitLab documentation renders and works correctly. In particular, that [main docs landing page](../../_index.md) works correctly from `/help`.
 For example, [GitLab.com's `/help`](https://gitlab.com/help).

doc/development/documentation/site_architecture/automation.md

@@ -50,7 +50,7 @@ that are coded across multiple repositories.
 | [Available custom role permissions](../../../user/custom_roles/abilities.md) | [Generated by Rake task](https://gitlab.com/gitlab-org/gitlab/-/blob/master/tooling/custom_roles/docs/templates/custom_abilities.md.erb) | [Authorization](https://handbook.gitlab.com/handbook/product/categories/#authorization-group)|
 | [Application settings analysis](../../cells/application_settings_analysis.md) | [Generated by Ruby script](https://gitlab.com/gitlab-org/gitlab/-/blob/2bb2910c84fad965bde473aa2881d88358b6e96e/scripts/cells/application-settings-analysis.rb#L353) | |
 | DAST vulnerability check documentation ([Example](../../../user/application_security/dast/browser/checks/798.19.md)) | [How to generate the Markdown](https://gitlab.com/gitlab-org/security-products/dast-cwe-checks/-/blob/main/doc/how-to-generate-the-markdown-documentation.md) | [Dynamic Analysis](https://handbook.gitlab.com/handbook/product/categories/#dynamic-analysis-group) |
-| [The docs homepage](../../../index.md) |  | [Technical Writing](https://handbook.gitlab.com/handbook/product/ux/technical-writing/) |
+| [The docs homepage](../../../_index.md) |  | [Technical Writing](https://handbook.gitlab.com/handbook/product/ux/technical-writing/) |
 
 ## Make an automation request
 

doc/security/hardening_cicd_recommendations.md

@@ -25,7 +25,7 @@ information to help harden the CI/CD process.
   container technology should be used, such as GCP Secret Manager, AWS KMS, or
   HashiCorp Vault. For self-managed and standalone instances, HashiCorp Vault is
   recommended, and many GitLab features can take advantage of Vault and are well
-  documented in the main [Documentation](../index.md). For detailed CI/CD examples, see [using external secrets in CI](../ci/secrets/_index.md).
+  documented in the main [Documentation](../_index.md). For detailed CI/CD examples, see [using external secrets in CI](../ci/secrets/_index.md).
 - **External Communications**. If your CI/CD process requires connectivity to other
   hosts, ensure that these communication channels are encrypted. You should use TLS 1.2 or 1.3, and where possible implement mutual TLS.
 - **Logging**. Logging can be very important for auditing and troubleshooting, so it

doc/user/markdown.md

@@ -592,7 +592,7 @@ Do not change it back to a markdown codeblock.
 
 <pre class="highlight"><code>- This line shows an [inline-style link](https://www.google.com)
 - This line shows a [link to a repository file in the same directory](permissions.md)
-- This line shows a [relative link to a file one directory higher](../index.md)
+- This line shows a [relative link to a file one directory higher](../_index.md)
 - This line shows a [link that also has title text](https://www.google.com "This link takes you to Google!")
 
 Using heading ID anchors:
@@ -615,7 +615,7 @@ Some text to show that the reference links can follow later.
 
 - This line shows an [inline-style link](https://www.google.com)
 - This line shows a [link to a repository file in the same directory](permissions.md)
-- This line shows a [relative link to a file one directory higher](../index.md)
+- This line shows a [relative link to a file one directory higher](../_index.md)
 - This line shows a [link that also has title text](https://www.google.com "This link takes you to Google!")
 
 Using heading ID anchors:
@@ -1674,7 +1674,7 @@ the content. This data can be used by static site generators like [Jekyll](https
 When you view a Markdown file rendered by GitLab, front matter is displayed as-is,
 in a box at the top of the document. The HTML content displays after the front matter. To view an example,
 you can toggle between the source and rendered version of a
-[GitLab documentation file](https://gitlab.com/gitlab-org/gitlab/-/blob/master/doc/index.md).
+[GitLab documentation file](https://gitlab.com/gitlab-org/gitlab/-/blob/master/doc/_index.md).
 
 In GitLab, front matter is used only in Markdown files and wiki pages, not the other
 places where Markdown formatting is supported. It must be at the very top of the document

doc/user/project/settings/import_export.md

@@ -125,7 +125,7 @@ and vice versa, assuming [compatibility](#compatibility) is met.
 
 If you're exporting a project from the Enterprise Edition to the Community Edition, you may lose
 data that is retained only in the Enterprise Edition. For more information, see
-[downgrading from EE to CE](../../../index.md).
+[downgrading from EE to CE](../../../downgrade_ee_to_ce/_index.md).
 
 ### Export a project and its data
 
@@ -335,7 +335,7 @@ Professional Services team.
 - You can export groups from the [Community Edition to the Enterprise Edition](https://about.gitlab.com/install/ce-or-ee/)
   and vice versa. The Enterprise Edition retains some group data that isn't part of the Community Edition. If you're
   exporting a group from the Enterprise Edition to the Community Edition, you may lose this data. For more information,
-  see [downgrading from EE to CE](../../../index.md).
+  see [downgrading from EE to CE](../../../downgrade_ee_to_ce/_index.md).
 
 The maximum import file size depends on whether you import to GitLab Self-Managed or GitLab.com:
 

locale/gitlab.pot

@@ -20237,6 +20237,9 @@ msgstr ""
 msgid "Deployment|You"
 msgstr ""
+msgid "Deprecated"
+msgstr ""
+
 msgid "Deprecated API rate limits"
 msgstr ""
@@ -50148,6 +50151,9 @@ msgstr ""
 msgid "Scan pushed document contents for policy breaks. %{docs_link}"
 msgstr ""
+msgid "ScanExecutionPolicy|%{boldStart}inject_ci%{boldEnd} strategy was deprecated. It was replaced by %{boldStart}inject_policy%{boldEnd} which enforces custom stages. %{linkStart}Learn more%{linkEnd}."
+msgstr ""
+
 msgid "ScanExecutionPolicy|%{hostname}'s timezone"
 msgstr ""
@@ -50217,6 +50223,9 @@ msgstr ""
 msgid "ScanExecutionPolicy|Inject"
 msgstr ""
+msgid "ScanExecutionPolicy|Inject without custom stages"
+msgstr ""
+
 msgid "ScanExecutionPolicy|Key"
 msgstr ""
@@ -50286,6 +50295,9 @@ msgstr ""
 msgid "ScanExecutionPolicy|The content of this pipeline execution YAML file is injected into the .gitlab-ci.yml file of the target project. All GitLab CI/CD features are supported."
 msgstr ""
+msgid "ScanExecutionPolicy|The content of this pipeline execution YAML file is injected into the .gitlab-ci.yml file of the target project. Custom stages used in the pipeline execution YAML are ignored, unless they are defined in the `.gitlab-ci.yml` file of the target project. All GitLab CI/CD features are supported."
+msgstr ""
+
 msgid "ScanExecutionPolicy|The content of this pipeline execution YAML file overrides the .gitlab-ci.yml file of the target project. All GitLab CI/CD features are supported."
 msgstr ""

package.json

@@ -54,7 +54,7 @@
     "@csstools/postcss-global-data": "^2.1.1",
     "@cubejs-client/core": "^1.0.0",
     "@floating-ui/dom": "^1.2.9",
-    "@gitlab/application-sdk-browser": "^0.3.3",
+    "@gitlab/application-sdk-browser": "^0.3.4",
     "@gitlab/at.js": "1.5.7",
     "@gitlab/cluster-client": "^2.4.0",
     "@gitlab/duo-ui": "^8.0.0",

scripts/lint-docs-redirects.rb

@@ -77,7 +77,7 @@ def check_for_missing_nav_entry(file)
     file_sub = file["old_path"].gsub('doc', project_slug).gsub(/_?index\.md/, '').gsub('.md',
       '.html')
 
-    result = navigation_file.include?(file_sub)
+    result = navigation_file.include?("'#{file_sub}'")
     return unless result
 
     # If we're here, the path exists in navigation

scripts/verify-tff-mapping

@@ -204,7 +204,7 @@ tests = [
 
   {
     explanation: 'The documentation index page is used in this haml_lint spec',
-    changed_file: 'doc/index.md',
+    changed_file: 'doc/_index.md',
     expected: ['spec/haml_lint/linter/documentation_links_spec.rb']
   },
 

spec/dot_gitlab_ci/ci_configuration_validation/shared_context_and_examples.rb

@@ -24,7 +24,7 @@
   let_it_be(:gitlab_org_gitlab_project) { create(:project, :empty_repo, group: group, path: 'gitlab') }
   let_it_be(:user) { create(:user) }
   let_it_be(:ci_glob) { Dir.glob("{.gitlab-ci.yml,.gitlab/**/*.yml}").freeze }
-  let_it_be(:ci_glob_with_common_file_globs) { [*ci_glob, 'lib/api/lint.rb', 'doc/index.md'] }
+  let_it_be(:ci_glob_with_common_file_globs) { [*ci_glob, 'lib/api/lint.rb', 'doc/_index.md'] }
   let_it_be(:master_branch) { 'master' }
 
   around do |example|