Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

.gitlab/ci/frontend.gitlab-ci.yml

@@ -311,7 +311,8 @@ jest:
       junit: junit_jest.xml
   parallel: 11
   script:
-    - run_timed_command "yarn jest:ci:without-fixtures"
+    - if [[ -z "${CI_MERGE_REQUEST_IID}" ]]; then export JEST_COVERAGE="--coverage"; fi
+    - run_timed_command "yarn jest:ci:without-fixtures $JEST_COVERAGE"
 
 jest-with-fixtures:
   extends:
@@ -325,7 +326,8 @@ jest-with-fixtures:
     - !reference [.with-fixtures-needs, needs]
   parallel: 2
   script:
-    - run_timed_command "yarn jest:ci:with-fixtures"
+    - if [[ -z "${CI_MERGE_REQUEST_IID}" ]]; then export JEST_COVERAGE="--coverage"; fi
+    - run_timed_command "yarn jest:ci:with-fixtures $JEST_COVERAGE"
 
 jest vue3:
   extends:

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

@@ -1479,7 +1479,7 @@
     - <<: *if-merge-request-labels-pipeline-expedite
       when: never
     - <<: *if-merge-request
-      changes: *code-backstage-patterns
+      when: never
     - <<: *if-default-branch-refs
       changes: *code-backstage-patterns
 
@@ -1717,6 +1717,7 @@
         <<: *qa-e2e-test-schedule-variables
         KNAPSACK_GENERATE_REPORT: "true"
         QA_RUN_IN_PARALLEL: "false"
+        COVERBAND_ENABLED: "true"
     - <<: *if-dot-com-gitlab-org-schedule
       variables:
         <<: *qa-e2e-test-schedule-variables

.gitlab/ci/test-on-cng/main.gitlab-ci.yml

@@ -224,6 +224,14 @@ export-test-metrics:
   variables:
     QA_METRICS_REPORT_FILE_PATTERN: $CI_PROJECT_DIR/qa/tmp/test-metrics-*.json
 
+export-code-paths-mapping:
+  extends:
+    - .export-code-paths-mapping
+  variables:
+    QA_CODE_PATHS_MAPPING_FILE_PATTERN: $CI_PROJECT_DIR/qa/tmp/test-code-paths-mapping-*.json
+  rules:
+    - if: '$COVERBAND_ENABLED == "true"'
+
 notify-slack:
   extends:
     - .notify-slack

.rubocop_todo/gitlab/bounded_contexts.yml

@@ -1368,7 +1368,6 @@ Gitlab/BoundedContexts:
     - 'app/policies/todo_policy.rb'
     - 'app/policies/upload_policy.rb'
     - 'app/policies/user_policy.rb'
-    - 'app/policies/wiki_page/meta_policy.rb'
     - 'app/policies/wiki_page_policy.rb'
     - 'app/policies/wiki_policy.rb'
     - 'app/policies/work_item_policy.rb'

.rubocop_todo/gitlab/documentation_links/link.yml

@@ -17,10 +17,6 @@ Gitlab/DocumentationLinks/Link:
     - 'app/presenters/key_presenter.rb'
     - 'app/serializers/merge_request_widget_entity.rb'
     - 'ee/app/components/namespaces/combined_storage_users/base_alert_component.rb'
-    - 'ee/app/components/namespaces/storage/limit_alert_component.rb'
-    - 'ee/app/components/namespaces/storage/pre_enforcement_alert_component.rb'
-    - 'ee/app/components/namespaces/storage/repository_limit_alert_component.rb'
-    - 'ee/app/controllers/gitlab_subscriptions/trials_controller.rb'
     - 'ee/app/helpers/billing_plans_helper.rb'
     - 'ee/app/helpers/ee/groups/settings_helper.rb'
     - 'ee/app/helpers/ee/import_helper.rb'
@@ -36,7 +32,6 @@ Gitlab/DocumentationLinks/Link:
     - 'ee/lib/gitlab/llm/chain/tools/tool.rb'
     - 'ee/lib/gitlab/llm/embeddings/utils/base_content_parser.rb'
     - 'ee/lib/system_check/geo/current_node_check.rb'
-    - 'ee/spec/components/namespaces/storage/pre_enforcement_alert_component_spec.rb'
     - 'ee/spec/helpers/ee/projects/security/api_fuzzing_configuration_helper_spec.rb'
     - 'ee/spec/helpers/projects/learn_gitlab_helper_spec.rb'
     - 'ee/spec/lib/gitlab/llm/embeddings/utils/base_content_parser_spec.rb'

.rubocop_todo/style/class_and_module_children.yml

@@ -293,7 +293,6 @@ Style/ClassAndModuleChildren:
     - 'app/models/protected_tag/create_access_level.rb'
     - 'app/policies/namespace/package_setting_policy.rb'
     - 'app/policies/namespace/root_storage_statistics_policy.rb'
-    - 'app/policies/wiki_page/meta_policy.rb'
     - 'app/serializers/ci/lint/job_entity.rb'
     - 'app/serializers/ci/lint/result_entity.rb'
     - 'app/serializers/ci/lint/result_serializer.rb'

GITLAB_OPENBAO_VERSION

@@ -1 +1 @@
-345392881a4f2786f4956789b8006b971966a476
+beaf1efbbbfcff64c465c19e3c49f1d527572b58

app/assets/javascripts/ci/pipeline_details/graph/components/job_item.vue

@@ -339,7 +339,7 @@ export default {
       :title="tooltipText"
       :href="detailsPath"
       :class="jobClasses"
-      class="menu-item gl-w-full gl-rounded-base gl-text-strong hover:gl-bg-gray-50 hover:gl-no-underline focus:gl-bg-gray-50 focus:gl-no-underline active:gl-no-underline [.gl-dark_&]:hover:gl-bg-gray-200 [.gl-dark_&]:focus:gl-bg-gray-200"
+      class="menu-item gl-w-full gl-rounded-base gl-text-strong hover:gl-bg-gray-50 hover:gl-no-underline focus:gl-bg-gray-50 focus:gl-no-underline active:gl-no-underline dark:hover:gl-bg-gray-200 dark:focus:gl-bg-gray-200"
       data-testid="ci-job-item-content"
       @click="jobItemClick"
       @mouseout="hideTooltips"

app/assets/javascripts/ci/pipeline_details/graph/components/stage_column_component.vue

@@ -81,9 +81,9 @@ export default {
     'gl-border-0',
     '!gl-rounded-base',
     'hover:gl-bg-gray-50',
-    '[.gl-dark_&]:hover:gl-bg-gray-200',
+    'dark:hover:gl-bg-gray-200',
     'focus:gl-bg-gray-50',
-    '[.gl-dark_&]:focus:gl-bg-gray-200',
+    'dark:focus:gl-bg-gray-200',
     'hover:gl-text-strong',
     'focus:gl-text-strong',
   ],

app/assets/javascripts/ci/pipeline_new/components/pipeline_new_form.vue

@@ -19,6 +19,7 @@ import { fetchPolicies } from '~/lib/graphql';
 import SafeHtml from '~/vue_shared/directives/safe_html';
 import { visitUrl } from '~/lib/utils/url_utility';
 import { s__, __, n__ } from '~/locale';
+import { helpPagePath } from '~/helpers/help_page_helper';
 import {
   IDENTITY_VERIFICATION_REQUIRED_ERROR,
   CONFIG_VARIABLES_TIMEOUT,
@@ -47,6 +48,7 @@ const i18n = {
   warningTitle: __('The form contains the following warning:'),
   maxWarningsSummary: __('%{total} warnings found: showing first %{warningsDisplayed}'),
   removeVariableLabel: s__('CiVariables|Remove variable'),
+  learnMore: __('Learn more'),
 };
 
 export default {
@@ -121,6 +123,10 @@ export default {
       type: Number,
       required: true,
     },
+    isMaintainer: {
+      type: Boolean,
+      required: true,
+    },
   },
   data() {
     return {
@@ -392,6 +398,9 @@ export default {
       }));
     },
   },
+  learnMorePath: helpPagePath('ci/variables/index', {
+    anchor: 'cicd-variable-precedence',
+  }),
 };
 </script>
 
@@ -523,13 +532,19 @@ export default {
         </div>
       </div>
 
-      <template #description
-        ><gl-sprintf :message="$options.i18n.variablesDescription">
+      <template #description>
+        <gl-sprintf :message="$options.i18n.variablesDescription">
           <template #link="{ content }">
-            <gl-link :href="settingsLink">{{ content }}</gl-link>
+            <gl-link v-if="isMaintainer" :href="settingsLink" data-testid="ci-cd-settings-link">{{
+              content
+            }}</gl-link>
+            <template v-else>{{ content }}</template>
           </template>
-        </gl-sprintf></template
-      >
+        </gl-sprintf>
+        <gl-link :href="$options.learnMorePath" target="_blank">{{
+          $options.i18n.learnMore
+        }}</gl-link>
+      </template>
     </gl-form-group>
     <div class="gl-mb-4 gl-text-gray-500">
       <gl-sprintf :message="$options.i18n.overrideNoteText">

app/assets/javascripts/ci/pipeline_new/index.js

@@ -22,6 +22,7 @@ const mountPipelineNewForm = (el) => {
     refParam,
     settingsLink,
     varParam,
+    isMaintainer,
   } = el.dataset;
 
   const variableParams = JSON.parse(varParam);
@@ -59,6 +60,7 @@ const mountPipelineNewForm = (el) => {
           refParam,
           settingsLink,
           variableParams,
+          isMaintainer,
         },
       });
     },

app/assets/javascripts/gitlab_pages/components/pages_edit.vue

@@ -107,7 +107,8 @@
     "Issue",
     "MergeRequest",
     "Snippet",
-    "Vulnerability"
+    "Vulnerability",
+    "WikiPage"
   ],
   "NoteableType": [
     "Design",

app/assets/javascripts/graphql_shared/possible_types.json

@@ -233,6 +233,7 @@ export function unresolvedDiscussionsIdsByDate() {
 }
 
 export function unresolvedDiscussionsIdsByDiff() {
+  // WARNING: never use this in regular code, this is only needed to avoid circular dependencies
   const authoritativeFiles = this.tryStore('legacyDiffs').diffFiles;
 
   return this.allResolvableDiscussions

app/assets/javascripts/notes/store/legacy_notes/getters.js

@@ -1,5 +1,16 @@
 import initCommitActions from '~/projects/commit';
 import { initCommitBoxInfo } from '~/projects/commit_box/info';
+import { renderHtmlStreams } from '~/streaming/render_html_streams';
+import { toPolyfillReadable } from '~/streaming/polyfills';
 
 initCommitBoxInfo();
 initCommitActions();
+
+const streamContainer = document.getElementById('js-stream-container');
+if (streamContainer) {
+  const request = fetch(streamContainer.dataset.diffsStreamUrl);
+  renderHtmlStreams(
+    [request.then((response) => toPolyfillReadable(response.body))],
+    streamContainer,
+  );
+}

app/assets/javascripts/pages/projects/commit/rapid_diffs/index.js

@@ -4,7 +4,7 @@ import { getDocument, GlobalWorkerOptions } from 'pdfjs-dist/legacy/build/pdf';
 
 import Page from './page/index.vue';
 
-GlobalWorkerOptions.workerSrc = '/assets/webpack/pdfjs/pdf.worker.min.js';
+GlobalWorkerOptions.workerSrc = process.env.PDF_JS_WORKER_PUBLIC_PATH;
 
 export default {
   components: { Page },

app/assets/javascripts/pdf/index.vue

@@ -18,6 +18,7 @@ const getNamespaceTargetRegex = (ref) => new RegExp(`(/-/(blob|tree))/${ref}/(.*
 export function generateRefDestinationPath(projectRootPath, ref, selectedRef) {
   const url = new URL(window.location.href);
   const currentPath = url.pathname;
+  const encodedHash = '%23';
   let refType = null;
   let namespace = '/-/tree';
   let target;
@@ -38,7 +39,12 @@ export function generateRefDestinationPath(projectRootPath, ref, selectedRef) {
   if (match) {
     [, namespace, , target] = match;
   }
-  url.pathname = joinPaths(projectRootPath, namespace, actualRef, target);
+  url.pathname = joinPaths(
+    projectRootPath,
+    namespace,
+    encodeURI(actualRef).replace(/#/g, encodedHash),
+    target,
+  );
 
   return url.toString();
 }

app/assets/javascripts/repository/utils/ref_switcher_utils.js

@@ -6,6 +6,7 @@ import { __, s__ } from '~/locale';
 import getBlobSearchQuery from '~/search/graphql/blob_search_zoekt.query.graphql';
 import { SCOPE_BLOB, SEARCH_TYPE_ZOEKT } from '~/search/sidebar/constants/index';
 import { DEFAULT_FETCH_CHUNKS } from '../constants';
+import { RECEIVE_NAVIGATION_COUNT } from '../../store/mutation_types';
 import StatusBar from './status_bar.vue';
 
 import ZoektBlobResults from './zoekt_blob_results.vue';
@@ -50,6 +51,10 @@ export default {
         this.hasError = false;
         this.blobSearch = data?.blobSearch;
         this.hasResults = data?.blobSearch?.files?.length > 0;
+        this.$store.commit(RECEIVE_NAVIGATION_COUNT, {
+          key: 'blobs',
+          count: data?.blobSearch?.matchCount.toString(),
+        });
       },
       debounce: 500,
       error() {

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

@@ -0,0 +1,21 @@
+query pending_todos_count(
+  $projectId: [ID!]
+  $groupId: [ID!]
+  $authorId: [ID!]
+  $action: [TodoActionEnum!]
+  $type: [TodoTargetEnum!]
+) {
+  currentUser {
+    id
+    todos(
+      state: [pending]
+      projectId: $projectId
+      groupId: $groupId
+      authorId: $authorId
+      action: $action
+      type: $type
+    ) {
+      count
+    }
+  }
+}