Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

.gitlab/ci/gitlab-com/danger-review.gitlab-ci.yml

@@ -1,6 +1,6 @@
 include:
   - project: gitlab-org/quality/pipeline-common
-    ref: 7.8.0
+    ref: 7.10.2
     file:
       - /ci/danger-review.yml
 

.gitlab/ci/rails.gitlab-ci.yml

@@ -754,13 +754,38 @@ rspec system pg14-as-if-foss clusterwide-db:
 rspec-ee unit gitlab-duo-chat pg14:
   variables:
     REAL_AI_REQUEST: "true"
-    VERTEX_AI_EMBEDDINGS: "true"
+    RSPEC_RETRY_RETRY_COUNT: 0
   extends:
     - .rspec-ee-base-pg14
-    - .rails:rules:ee-gitlab-duo-chat-vertex-ai
+    - .rails:rules:ee-gitlab-duo-chat-base
+  parallel:
+    matrix:
+      - DUO_RSPEC: ["lib/gitlab/llm/chain/agents/zero_shot/executor_real_requests_spec.rb", "support_specs/helpers/chat_qa_evaluation_helpers_spec.rb"]
   script:
     - !reference [.base-script, script]
-    - rspec_paralellized_job "--fail-fast=${RSPEC_FAIL_FAST_THRESHOLD} --tag real_ai_request"
+    - bundle exec rspec -Ispec -rspec_helper --failure-exit-code 0 --tag real_ai_request --color -- ee/spec/${DUO_RSPEC}
+
+rspec-ee unit gitlab-duo-chat-qa pg14:
+  variables:
+    REAL_AI_REQUEST: "true"
+    RSPEC_RETRY_RETRY_COUNT: 0
+  extends:
+    - .rspec-ee-base-pg14
+    - .rails:rules:ee-gitlab-duo-chat-base
+  parallel:
+    matrix:
+      - DUO_RSPEC: ["qa_epic_spec.rb", "qa_issue_spec.rb"]
+  script:
+    - !reference [.base-script, script]
+    - source ./scripts/utils.sh
+    - install_gitlab_gem
+    - bundle exec rspec -Ispec -rspec_helper --failure-exit-code 0 --tag real_ai_request --color -- ee/spec/lib/gitlab/llm/chain/agents/zero_shot/${DUO_RSPEC}
+    - ./scripts/duo_chat/reporter.rb
+  artifacts:
+    expire_in: 5d
+    paths:
+      - tmp/duo_chat/qa*.json
+      - "${DUO_RSPEC}.md"
 
 rspec-ee migration pg14:
   extends:

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

@@ -65,7 +65,7 @@
 .if-merge-request-labels-run-in-ruby3_1: &if-merge-request-labels-run-in-ruby3_1
   if: '$CI_MERGE_REQUEST_LABELS =~ /pipeline:run-in-ruby3_1/'
 
-.if-merge-request-labels-run-in-non-default-ruby: &if-merge-request-labels-run-in-non-default-ruby
+.if-merge-request-labels-run-in-ruby3_2: &if-merge-request-labels-run-in-ruby3_2
   if: '$CI_MERGE_REQUEST_LABELS =~ /pipeline:run-in-ruby3_2/'
 
 .if-merge-request-labels-as-if-foss: &if-merge-request-labels-as-if-foss
@@ -2117,20 +2117,14 @@
       when: never
     - if: '$ANTHROPIC_API_KEY == null'
       when: never
-    - <<: *if-merge-request
-      changes: *ai-patterns
-      when: manual
-      allow_failure: true
-
-.rails:rules:ee-gitlab-duo-chat-vertex-ai:
-  rules:
-    - !reference [".rails:rules:ee-gitlab-duo-chat-base", rules]
     - if: '$VERTEX_AI_PROJECT == null'
       when: never
     - if: '$VERTEX_AI_CREDENTIALS == null'
       when: never
-    - if: '$VERTEX_AI_EMBEDDINGS == null'
-      when: never
+    - <<: *if-merge-request
+      changes: *ai-patterns
+      when: manual
+      allow_failure: true
 
 .rails:rules:as-if-foss-migration:
   rules:
@@ -2746,7 +2740,7 @@
 
 .setup:rules:verify-default-ruby:
   rules:
-    - <<: *if-merge-request-labels-run-in-non-default-ruby
+    - <<: *if-merge-request-labels-run-in-ruby3_2
 
 .setup:rules:verify-tests-yml:
   rules:

GITALY_SERVER_VERSION

@@ -1 +1 @@
-5867f71c734a055e3af41e237ce19f992dd68120
+9bf28d2089501b82b40e2b9f6ad21cf80751f15f

Gemfile

@@ -537,7 +537,7 @@ gem 'kas-grpc', '~> 0.2.0' # rubocop:todo Gemfile/MissingFeatureCategory
 
 gem 'grpc', '~> 1.58.0' # rubocop:todo Gemfile/MissingFeatureCategory
 
-gem 'google-protobuf', '~> 3.24', '>= 3.24.4' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'google-protobuf', '~> 3.25' # rubocop:todo Gemfile/MissingFeatureCategory
 
 gem 'toml-rb', '~> 2.2.0' # rubocop:todo Gemfile/MissingFeatureCategory
 

Gemfile.checksum

@@ -243,16 +243,16 @@
 {"name":"google-cloud-errors","version":"1.3.0","platform":"ruby","checksum":"450b681e24c089a20721a01acc4408bb4a7b0df28c175aaab488da917480d64b"},
 {"name":"google-cloud-profiler-v2","version":"0.4.0","platform":"ruby","checksum":"53fc2ab175d08f54233c644310d47798feac996220916815c4fb44c937b5d3e3"},
 {"name":"google-cloud-storage","version":"1.44.0","platform":"ruby","checksum":"299a1e055c9277c8120f7c10d21d37e4d8c17c7b963350c0e0bff7e9d9a570ea"},
-{"name":"google-protobuf","version":"3.24.4","platform":"aarch64-linux","checksum":"d3e824753a9511e4c08439586069a636c23d9ca16a509f316a895353c11a1ac8"},
-{"name":"google-protobuf","version":"3.24.4","platform":"arm64-darwin","checksum":"e13b12a648668d99d8b71ffcf378bfd744885af11e983460677073b2c8e2a979"},
-{"name":"google-protobuf","version":"3.24.4","platform":"java","checksum":"657d67b5425afa0beb94e54df7d0a15da3daa45a500fc252e7550806669b47f1"},
-{"name":"google-protobuf","version":"3.24.4","platform":"ruby","checksum":"38a403ca2fd905d3ed7c20f8d2e4718af1be3eb99093d35d7021383f6e72f2ca"},
-{"name":"google-protobuf","version":"3.24.4","platform":"x64-mingw-ucrt","checksum":"fc0396dd9f45ea54d494097e0077ee8c0cc002f1c825f06ed40f4e3b4de6948c"},
-{"name":"google-protobuf","version":"3.24.4","platform":"x64-mingw32","checksum":"ba1b5cd5effa6c6a738eb2d2d0701e3d83d95b81842564b5feb9c42579722fc6"},
-{"name":"google-protobuf","version":"3.24.4","platform":"x86-linux","checksum":"f9cae6c878381da082eab1d3eceb84525c7d7413401e1a4a5ee179b66fdbebe0"},
-{"name":"google-protobuf","version":"3.24.4","platform":"x86-mingw32","checksum":"4cf31ca7d447a86200dfcb86f64ddd046c1f9c96dc537c9d74ab19e0c36a8f0b"},
-{"name":"google-protobuf","version":"3.24.4","platform":"x86_64-darwin","checksum":"44d541e980989f1aa007a3c5481ec93932b2e50cfa63c22427dd42460a5d2865"},
-{"name":"google-protobuf","version":"3.24.4","platform":"x86_64-linux","checksum":"68f65302fad9f47c88d38136fda0dec6078f3a2a79fb5bcccf62121fd8fcca50"},
+{"name":"google-protobuf","version":"3.25.0","platform":"aarch64-linux","checksum":"4455602758a60bd698a57c7210efc440523523fbe0c0c712624e57bb02c6c9d4"},
+{"name":"google-protobuf","version":"3.25.0","platform":"arm64-darwin","checksum":"c1ba0bb5504155f5bd0d11d649316ff52cef5b2a1e7ce876497815f98be3c5a6"},
+{"name":"google-protobuf","version":"3.25.0","platform":"java","checksum":"7006d8485d6c729c081a7eb8592d8c494fd8716863a7fb7ad7c76188eafc41a5"},
+{"name":"google-protobuf","version":"3.25.0","platform":"ruby","checksum":"b51632d900b633fbd6164784351bee93001dfd3f32bd18f6505fc97d64e1a1a1"},
+{"name":"google-protobuf","version":"3.25.0","platform":"x64-mingw-ucrt","checksum":"e4935e41e0f3c32fe96e496803de61d36273474ebb72ac7ee9db3a4ecb4b5cd6"},
+{"name":"google-protobuf","version":"3.25.0","platform":"x64-mingw32","checksum":"42b13346a1be8346e4d62a41ac7150f374ca5d254b3bb4bf3bc817de522ce969"},
+{"name":"google-protobuf","version":"3.25.0","platform":"x86-linux","checksum":"7f391788f013778ffae197a184481ff24265a977d1cb2270b13a5af1ba2f53d5"},
+{"name":"google-protobuf","version":"3.25.0","platform":"x86-mingw32","checksum":"2f42a5738af0a874b35b228a2df8de21a58fa265627cfd0fa57edaea160c1087"},
+{"name":"google-protobuf","version":"3.25.0","platform":"x86_64-darwin","checksum":"c3d4a144d8f4d61193ab1a4c5d52e2d40562ba13e07eeca1fca34bc59212c352"},
+{"name":"google-protobuf","version":"3.25.0","platform":"x86_64-linux","checksum":"c6a76175c921b300ee62b21d36e8a9c07f0a4967a17be0671a83c57d7bf9bd0f"},
 {"name":"googleapis-common-protos","version":"1.4.0","platform":"ruby","checksum":"da2380fb5ab1563580816c74e8d684ac17512c3654c829a3ee84f6d6139de382"},
 {"name":"googleapis-common-protos-types","version":"1.5.0","platform":"ruby","checksum":"5769cf7376abc86ef7f5897a4aaca1d5c5a3c49ddabeddd2c251fcf8155f858b"},
 {"name":"googleauth","version":"1.3.0","platform":"ruby","checksum":"51dd7362353cf1e90a2d01e1fb94321ae3926c776d4dc4a79db65230217ffcc2"},

Gemfile.lock

@@ -766,7 +766,7 @@ GEM
       google-cloud-core (~> 1.6)
       googleauth (>= 0.16.2, < 2.a)
       mini_mime (~> 1.0)
-    google-protobuf (3.24.4)
+    google-protobuf (3.25.0)
     googleapis-common-protos (1.4.0)
       google-protobuf (~> 3.14)
       googleapis-common-protos-types (~> 1.2)
@@ -1861,7 +1861,7 @@ DEPENDENCIES
   google-apis-serviceusage_v1 (~> 0.28.0)
   google-apis-sqladmin_v1beta4 (~> 0.41.0)
   google-cloud-storage (~> 1.44.0)
-  google-protobuf (~> 3.24, >= 3.24.4)
+  google-protobuf (~> 3.25)
   gpgme (~> 2.0.23)
   grape (~> 1.7.1)
   grape-entity (~> 0.10.0)

app/assets/javascripts/access_tokens/components/access_token_table_app.vue

@@ -158,7 +158,7 @@ export default {
               :aria-label="$options.i18n.revokeButton"
               :data-confirm="modalMessage(name)"
               data-confirm-btn-variant="danger"
-              data-testid="revoke-button"
+              data-qa-selector="revoke_button"
               data-method="put"
               :href="revokePath"
               icon="remove"

app/assets/javascripts/access_tokens/components/expires_at_field.vue

@@ -68,7 +68,7 @@ export default {
       :input-name="inputAttrs.name"
       :input-id="inputAttrs.id"
       :placeholder="inputAttrs.placeholder"
-      data-testid="expiry-date-field"
+      data-qa-selector="expiry_date_field"
     />
     <template #description>
       <template v-if="description">

app/assets/javascripts/access_tokens/components/new_access_token_app.vue

@@ -45,7 +45,7 @@ export default {
     formInputGroupProps() {
       return {
         id: this.$options.tokenInputId,
-        'data-testid': 'created-access-token-field',
+        'data-qa-selector': 'created_access_token_field',
         name: this.$options.tokenInputId,
       };
     },
@@ -110,7 +110,7 @@ export default {
     @[$options.EVENT_ERROR]="onError"
     @[$options.EVENT_SUCCESS]="onSuccess"
   >
-    <div ref="container" data-testid="access-token-section">
+    <div ref="container" data-testid="access-token-section" data-qa-selector="access_token_section">
       <gl-alert
         v-if="newToken"
         variant="success"

app/assets/javascripts/authentication/two_factor_auth/components/recovery_codes.vue

@@ -115,10 +115,14 @@ export default {
       </gl-sprintf>
     </p>
 
-    <gl-card class="codes-to-print gl-my-5" data-testid="recovery-codes">
+    <gl-card
+      class="codes-to-print gl-my-5"
+      data-testid="recovery-codes"
+      data-qa-selector="codes_content"
+    >
       <ul class="gl-m-0 gl-pl-5">
         <li v-for="(code, index) in codes" :key="index">
-          <span class="gl-font-monospace" data-testid="code-content">{{ code }}</span>
+          <span class="gl-font-monospace" data-qa-selector="code_content">{{ code }}</span>
         </li>
       </ul>
     </gl-card>
@@ -127,7 +131,7 @@ export default {
         <clipboard-button
           :title="$options.i18n.copyButton"
           :text="codesAsString"
-          data-testid="copy-button"
+          data-qa-selector="copy_button"
           @click="handleButtonClick($options.copyButtonAction)"
         >
           {{ $options.i18n.copyButton }}
@@ -159,7 +163,7 @@ export default {
           :disabled="proceedButtonDisabled"
           :title="$options.i18n.proceedButton"
           variant="confirm"
-          data-testid="proceed-button"
+          data-qa-selector="proceed_button"
           data-track-action="click_button"
           :data-track-label="`${$options.trackingLabelPrefix}proceed_button`"
           >{{ $options.i18n.proceedButton }}</gl-button

app/assets/javascripts/invite_members/components/invite_group_trigger.vue

@@ -28,7 +28,12 @@ export default {
 </script>
 
 <template>
-  <gl-button :class="classes" data-testid="invite-a-group-button" @click="openModal">
+  <gl-button
+    :class="classes"
+    data-qa-selector="invite_a_group_button"
+    data-test-id="invite-group-button"
+    @click="openModal"
+  >
     {{ displayText }}
   </gl-button>
 </template>

app/assets/javascripts/invite_members/components/invite_members_trigger.vue

@@ -4,6 +4,7 @@ import { s__ } from '~/locale';
 import eventHub from '../event_hub';
 import {
   TRIGGER_ELEMENT_BUTTON,
+  TRIGGER_DEFAULT_QA_SELECTOR,
   TRIGGER_ELEMENT_WITH_EMOJI,
   TRIGGER_ELEMENT_DROPDOWN_WITH_EMOJI,
   TRIGGER_ELEMENT_DISCLOSURE_DROPDOWN,
@@ -41,12 +42,18 @@ export default {
       required: false,
       default: 'button',
     },
+    qaSelector: {
+      type: String,
+      required: false,
+      default: TRIGGER_DEFAULT_QA_SELECTOR,
+    },
   },
   computed: {
     componentAttributes() {
       return {
         class: this.classes,
-        'data-testid': 'invite-members-button',
+        'data-qa-selector': this.qaSelector,
+        'data-test-id': 'invite-members-button',
       };
     },
     item() {

app/assets/javascripts/invite_members/components/invite_modal_base.vue

@@ -173,6 +173,7 @@ export default {
           variant: 'confirm',
           disabled: this.submitDisabled,
           loading: this.isLoading,
+          'data-qa-selector': 'invite_button',
         },
       };
     },
@@ -310,7 +311,7 @@ export default {
           <gl-form-select
             :id="dropdownId"
             v-model="selectedAccessLevel"
-            data-testid="access-level-dropdown"
+            data-qa-selector="access_level_dropdown"
             :options="accessLevelsOptions"
           />
         </gl-form-group>

app/assets/javascripts/invite_members/components/members_token_select.vue

@@ -102,6 +102,7 @@ export default {
     textInputAttrs() {
       return {
         'data-testid': 'members-token-select-input',
+        'data-qa-selector': 'members_token_select_input',
         id: this.inputId,
       };
     },

app/assets/javascripts/invite_members/constants.js

@@ -20,6 +20,7 @@ export const TRIGGER_ELEMENT_WITH_EMOJI = 'text-emoji';
 export const TRIGGER_ELEMENT_DROPDOWN_WITH_EMOJI = 'dropdown-text-emoji';
 export const TRIGGER_ELEMENT_DISCLOSURE_DROPDOWN = 'dropdown-text';
 export const INVITE_MEMBER_MODAL_TRACKING_CATEGORY = 'invite_members_modal';
+export const TRIGGER_DEFAULT_QA_SELECTOR = 'invite_members_button';
 export const IMPORT_PROJECT_MEMBERS_MODAL_TRACKING_CATEGORY = 'invite_project_members_modal';
 export const IMPORT_PROJECT_MEMBERS_MODAL_TRACKING_LABEL = 'project-members-page';
 export const MEMBERS_MODAL_DEFAULT_TITLE = s__('InviteMembersModal|Invite members');

app/assets/javascripts/pages/profiles/two_factor_auths/index.js

@@ -8,7 +8,7 @@ const skippable = twoFactorNode ? parseBoolean(twoFactorNode.dataset.twoFactorSk
 
 if (skippable) {
   const button = `<div class="gl-alert-actions">
-                    <a class="btn gl-button btn-md btn-confirm gl-alert-action" data-testid="configure-it-later-button" data-method="patch" href="${twoFactorNode.dataset.two_factor_skip_url}">Configure it later</a>
+                    <a class="btn gl-button btn-md btn-confirm gl-alert-action" data-qa-selector="configure_it_later_button" data-method="patch" href="${twoFactorNode.dataset.two_factor_skip_url}">Configure it later</a>
                   </div>`;
   const flashAlert = document.querySelector('.flash-alert');
   if (flashAlert) {

app/assets/javascripts/profile/account/components/delete_account_modal.vue

@@ -42,7 +42,7 @@ export default {
         text: __('Delete account'),
         attributes: {
           variant: 'danger',
-          'data-testid': 'confirm-delete-account-button',
+          'data-qa-selector': 'confirm_delete_account_button',
           category: 'primary',
           disabled: !this.canSubmit,
         },
@@ -128,7 +128,7 @@ Once you confirm %{deleteAccount}, it cannot be undone or recovered.`),
         name="password"
         class="form-control"
         type="password"
-        data-testid="password-confirmation-field"
+        data-qa-selector="password_confirmation_field"
         aria-labelledby="input-label"
       />
       <input

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

@@ -88,7 +88,7 @@ export default {
         text: this.$options.i18n.editProfile,
         href: this.data.settings.profile_path,
         extraAttrs: {
-          'data-testid': 'edit-profile-link',
+          'data-testid': 'edit_profile_link',
           ...USER_MENU_TRACKING_DEFAULTS,
           'data-track-label': 'user_edit_profile',
         },
@@ -235,7 +235,7 @@ export default {
             :entity-name="data.name"
             :src="data.avatar_url"
             aria-hidden="true"
-            data-testid="user-avatar-content"
+            data-testid="user_avatar_content"
           />
           <span
             v-if="showNotificationDot"

app/assets/javascripts/terms/components/app.vue

@@ -66,7 +66,7 @@ export default {
 
 <template>
   <div>
-    <div class="gl-relative gl-pb-0 gl-px-0" data-testid="terms-content">
+    <div class="gl-relative gl-pb-0 gl-px-0" data-qa-selector="terms_content">
       <div
         class="terms-fade gl-absolute gl-left-5 gl-right-5 gl-bottom-0 gl-h-11 gl-pointer-events-none"
       ></div>
@@ -97,7 +97,7 @@ export default {
           type="submit"
           variant="confirm"
           :disabled="acceptDisabled"
-          data-testid="accept-terms-button"
+          data-qa-selector="accept_terms_button"
           >{{ $options.i18n.accept }}</gl-button
         >
         <input :value="$options.csrf.token" type="hidden" name="authenticity_token" />

app/assets/javascripts/vue_shared/components/confirm_danger/confirm_danger_modal.vue

@@ -72,7 +72,7 @@ export default {
         attributes: {
           variant: 'danger',
           disabled: !this.isValid,
-          'data-testid': 'confirm-danger-modal-button',
+          'data-qa-selector': 'confirm_danger_modal_button',
         },
       };
     },
@@ -133,7 +133,8 @@ export default {
         id="confirm_name_input"
         v-model="confirmationPhrase"
         class="form-control"
-        data-testid="confirm-danger-field"
+        data-qa-selector="confirm_danger_field"
+        data-testid="confirm-danger-input"
         type="text"
       />
     </gl-form-group>

app/assets/javascripts/vue_shared/components/form/input_copy_toggle_visibility.vue

@@ -176,6 +176,7 @@ export default {
           :aria-label="toggleVisibilityLabel"
           :icon="toggleVisibilityIcon"
           data-testid="toggle-visibility-button"
+          data-qa-selector="toggle_visibility_button"
           @click.stop="handleToggleVisibilityButtonClick"
         />
         <clipboard-button

app/controllers/concerns/issuable_actions.rb

@@ -147,6 +147,8 @@ def discussions
     finder = Issuable::DiscussionsListService.new(current_user, issuable, finder_params_for_issuable)
     discussion_notes = finder.execute
 
+    yield discussion_notes if block_given?
+
     if finder.paginator.present? && finder.paginator.has_next_page?
       response.headers['X-Next-Page-Cursor'] = finder.paginator.cursor_for_next_page
     end