Add latest changes from gitlab-org/gitlab@master

.gitlab/ci/caching.gitlab-ci.yml

@@ -9,12 +9,18 @@ cache-workhorse:
   variables:
     SETUP_DB: "false"
   script:
-    - source scripts/gitlab_component_helpers.sh
-    - 'gitlab_workhorse_archive_doesnt_exist || { echoinfo "INFO: Exiting early as package exists."; exit 0; }'
-    - run_timed_command "scripts/setup-test-env"
-    - run_timed_command "select_gitlab_workhorse_essentials"
-    - run_timed_command "create_gitlab_workhorse_package"
-    - run_timed_command "upload_gitlab_workhorse_package"
+    - |
+      function cache_workhorse() {
+        source scripts/gitlab_component_helpers.sh
+        gitlab_workhorse_archive_doesnt_exist || { echoinfo "INFO: Exiting early as package exists."; exit 0; }
+        run_timed_command "scripts/setup-test-env"
+        run_timed_command "select_gitlab_workhorse_essentials"
+        run_timed_command "create_gitlab_workhorse_package"
+        run_timed_command "upload_gitlab_workhorse_package"
+      }
+
+      run_with_custom_exit_code cache_workhorse
+
   artifacts:
     expire_in: 7d
     paths:
@@ -29,14 +35,19 @@ cache-workhorse:
   variables:
     WEBPACK_REPORT: "false"
   script:
-    - yarn_install_script
-    - export GITLAB_ASSETS_HASH=$(bundle exec rake gitlab:assets:hash_sum)
-    - source scripts/gitlab_component_helpers.sh
-    - 'gitlab_assets_archive_doesnt_exist || { echoinfo "INFO: Exiting early as package exists."; exit 0; }'
-    - assets_compile_script
-    - echo -n "${GITLAB_ASSETS_HASH}" > "cached-assets-hash.txt"
-    - run_timed_command "create_gitlab_assets_package"
-    - run_timed_command "upload_gitlab_assets_package"
+    - |
+      function cache_assets() {
+        yarn_install_script
+        source scripts/gitlab_component_helpers.sh
+        export GITLAB_ASSETS_HASH=$(bundle exec rake gitlab:assets:hash_sum)
+        gitlab_assets_archive_doesnt_exist || { echoinfo "INFO: Exiting early as package exists."; exit 0; }
+        assets_compile_script
+        echo -n "${GITLAB_ASSETS_HASH}" > "cached-assets-hash.txt"
+        run_timed_command "create_gitlab_assets_package"
+        run_timed_command "upload_gitlab_assets_package"
+      }
+
+      run_with_custom_exit_code cache_assets
 
 cache-assets:test:
   extends: .cache-assets-base

app/assets/javascripts/search/results/components/status_bar.vue

@@ -27,6 +27,11 @@ export default {
       type: Boolean,
       required: true,
     },
+    error: {
+      type: String,
+      required: false,
+      default: '',
+    },
   },
   computed: {
     ...mapState(['query', 'groupInitialJson', 'projectInitialJson', 'repositoryRef']),
@@ -75,6 +80,9 @@ export default {
         this?.resultsTotal ?? 0,
       );
     },
+    hasError() {
+      return Boolean(this.error);
+    },
   },
   methods: {
     handleInput(selected) {

doc/editor_extensions/jetbrains_ide/setup.md

@@ -14,9 +14,12 @@ Prerequisites:
 - JetBrains IDEs: **2023.2.X** and later.
 - GitLab version 16.8 or later.
 
-If you use an older version of a JetBrains IDE, check the version compatibility list on the marketplace listing.
-It contains a table of plugin versions and their
-[supported IDE versions](https://plugins.jetbrains.com/plugin/22325-gitlab-duo/versions).
+If you use an older version of a JetBrains IDE, download a version of the plugin compatible with your IDE:
+
+1. On the GitLab Duo [plugin page](https://plugins.jetbrains.com/plugin/22325-gitlab-duo), select **Versions**.
+1. Select **Compatibility**, then select your JetBrains IDE.
+1. Select a **Channel** to filter for stable releases or alpha releases.
+1. In the compatibility table, find your IDE version and select **Download**.
 
 ## Enable the plugin
 

doc/user/get_started/_index.md

@@ -7,25 +7,9 @@ title: Get started with GitLab
 
 If you're new to GitLab, get started learning about how GitLab works.
 
-## Need to learn Git basics?
-
-- [Get started with Git](../../topics/git/get_started.md)
-
-## Need to learn about using AI as part of your workflow?
-
-- [Get started with GitLab Duo](../../user/get_started/getting_started_gitlab_duo.md)
-
-## Need to learn about core product features?
-
-- [Get started organizing work with projects](../../user/get_started/get_started_projects.md)
-- [Get started planning work](../../user/get_started/get_started_planning_work.md)
-- [Get started managing code](../../user/get_started/get_started_managing_code.md)
-- [Get started with GitLab CI/CD](../../ci/_index.md)
-- [Get started securing your application](../../user/application_security/get-started-security.md)
-- [Get started deploying and releasing your application](../../user/get_started/get_started_deploy_release.md)
-- [Get started managing your infrastructure](../../user/get_started/get_started_managing_infrastructure.md)
-- [Get started with monitoring your application in GitLab](../../user/get_started/get_started_monitoring.md)
-
-## Need to use the API or integrate a third-party application?
-
-- [Get started extending GitLab](../../api/get_started/get_started_extending.md)
+| | | |
+|--|--|--|
+| [**Get started with Git**](../../topics/git/get_started.md)<br>Learn Git basics. | [**Get started with GitLab Duo**](../../user/get_started/getting_started_gitlab_duo.md)<br>Use AI as part of your workflow. | [**Get started organizing work with projects**](../../user/get_started/get_started_projects.md)<br>Use projects as a starting point. |
+| [**Get started planning work**](../../user/get_started/get_started_planning_work.md)<br>Organize your backlog. | [**Get started managing code**](../../user/get_started/get_started_managing_code.md)<br>Use merge requests to iterate on code. | [**Get started with GitLab CI/CD**](../../ci/_index.md)<br>Build your application. |
+| [**Get started securing your application**](../../user/application_security/get-started-security.md)<br>Secure your application. | [**Get started deploying and releasing your application**](../../user/get_started/get_started_deploy_release.md)<br>Get your app out to customers. | [**Get started managing your infrastructure**](../../user/get_started/get_started_managing_infrastructure.md)<br>Manage your infrastructure. |
+| [**Get started with monitoring your application in GitLab**](../../user/get_started/get_started_monitoring.md)<br>Monitor performance. | [**Get started extending GitLab**](../../api/get_started/get_started_extending.md)<br>Work with the API or integrate with third-party applications. | |

locale/gitlab.pot

@@ -50503,7 +50503,7 @@ msgstr ""
 msgid "ScanResultPolicy|Unknown"
 msgstr ""
 
-msgid "ScanResultPolicy|Use this format for package paths: path/file.yaml@group-name/project-name. For multiple packages, separate paths with comma \",\"."
+msgid "ScanResultPolicy|Use purl format for package paths: %{schemaStart}scheme:type/namespace/name@version?qualifiers#subpath%{schemaEnd}. For multiple packages, separate paths with comma \",\"."
 msgstr ""
 
 msgid "ScanResultPolicy|When %{scanType} %{scanners} runs against the %{branches} %{branchExceptions} and find(s) %{vulnerabilitiesNumber} %{boldDescription} of the following criteria:"
@@ -52388,6 +52388,9 @@ msgstr ""
 msgid "SecurityOrchestration|Warn in merge request"
 msgstr ""
 
+msgid "SecurityOrchestration|Warn users with a bot comment and contact the following users as security consultants for support: %{approvers}"
+msgstr ""
+
 msgid "SecurityOrchestration|What does an example message look like?"
 msgstr ""
 

scripts/frontend/quarantined_vue3_specs.txt

@@ -237,7 +237,6 @@ spec/frontend/repository/components/header_area/blob_overflow_menu_spec.js
 spec/frontend/repository/components/table/index_spec.js
 spec/frontend/repository/components/table/row_spec.js
 spec/frontend/repository/router_spec.js
-spec/frontend/search/results/components/status_bar_spec.js
 spec/frontend/search/sidebar/components/checkbox_filter_spec.js
 spec/frontend/search/sidebar/components/label_dropdown_items_spec.js
 spec/frontend/search/topbar/components/app_spec.js