Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

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

@@ -80,6 +80,8 @@ include:
     SKIP_IMAGE_VERIFICATION: "true"
     # set specific arch list
     ARCH_LIST: amd64
+    # use larger runner for complex rails build jobs
+    HIGH_CAPACITY_RUNNER_TAG: high-cpu
   trigger:
     project: '${CI_PROJECT_NAMESPACE}/$[[ inputs.cng_path ]]'
     branch: $TRIGGER_BRANCH

.gitlab/ci/global.gitlab-ci.yml

@@ -16,7 +16,7 @@
     - export GOPATH=$CI_PROJECT_DIR/.go
     - mkdir -p $GOPATH
     - source scripts/utils.sh
-    - log_disk_usage before_script # https://gitlab.com/gitlab-org/gitlab/-/issues/478880
+    - log_disk_usage "false" # https://gitlab.com/gitlab-org/gitlab/-/issues/478880
 
 .default-before_script:
   before_script:

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

@@ -102,7 +102,7 @@ include:
     - rspec_section rspec_parallelized_job "--fail-fast=${RSPEC_FAIL_FAST_THRESHOLD} --tag ~quarantine --tag ~level:background_migration --tag ~click_house"
   after_script:
     - source scripts/utils.sh
-    - log_disk_usage after_script # https://gitlab.com/gitlab-org/gitlab/-/issues/478880
+    - log_disk_usage # https://gitlab.com/gitlab-org/gitlab/-/issues/478880
     - bundle exec gem list gitlab_quality-test_tooling
     - |
       section_start "failed-test-issues" "Report test failures"

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

@@ -2558,6 +2558,13 @@
     - <<: *if-default-refs
       changes: *code-backstage-qa-patterns
 
+.static-analysis:rules:ensure-application-settings-have-definition-file:
+  rules:
+    - <<: *if-default-refs
+      changes:
+        - db/structure.sql
+        - config/application_setting_columns/*.yml
+
 .static-analysis:rules:haml-lint:
   rules:
     - <<: *if-default-refs

.gitlab/ci/static-analysis.gitlab-ci.yml

@@ -169,6 +169,16 @@ feature-flags-usage:
     paths:
       - tmp/feature_flags/
 
+ensure-application-settings-have-definition-file:
+  image: ruby:${RUBY_VERSION}-alpine
+  extends:
+    - .static-analysis-base
+    - .static-analysis:rules:ensure-application-settings-have-definition-file
+  variables:
+    USE_BUNDLE_INSTALL: "false"
+  script:
+    - run_timed_command "scripts/cells/ci-ensure-application-settings-have-definition-file.rb"
+
 semgrep-appsec-custom-rules:
   stage: lint
   extends:

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

@@ -105,11 +105,6 @@ build-cng:
   variables:
     # use larger runner for complex rails build jobs
     HIGH_CAPACITY_RUNNER_TAG: e2e
-  # quality specific fork, see: https://gitlab.com/gitlab-org/quality/quality-engineering/team-tasks/-/issues/2839
-  trigger:
-    project: ${CI_PROJECT_NAMESPACE}/quality/quality-engineering/CNG-mirror
-    branch: $TRIGGER_BRANCH
-    strategy: depend
 
 download-knapsack-report:
   extends:

.lefthook/gitleaks.sh

@@ -0,0 +1,37 @@
+#!/bin/bash
+set -euo pipefail
+
+MINIMUM_VERSION="v8.20"
+SCRIPT_NAME=$(basename "$0")
+HOOK_TYPE="${1:-}"
+
+if ! command -v gitleaks &>/dev/null; then
+  cat >&2 <<EOF
+WARNING: gitleaks is not installed. Skipping secrets detection.
+Please install at least version v$MINIMUM_VERSION using "asdf install" or see:
+https://gitlab.com/gitlab-com/gl-security/security-research/gitleaks-endpoint-installer.
+EOF
+  exit 0
+fi
+
+if [ -z "$HOOK_TYPE" ]; then
+  cat >&2 <<EOF
+ERROR: Hook type argument is required.
+Usage: ./$SCRIPT_NAME [pre-commit|pre-push]
+Please specify 'pre-commit' or 'pre-push' as the argument.
+EOF
+  exit 1
+fi
+
+if [ "$HOOK_TYPE" == "pre-commit" ]; then
+  gitleaks git --pre-commit --staged --no-banner --redact --verbose
+elif [ "$HOOK_TYPE" == "pre-push" ]; then
+  BASE_COMMIT=$(git merge-base origin/master HEAD)
+  gitleaks git --log-opts="$BASE_COMMIT..HEAD" --no-banner --redact --verbose
+else
+  cat >&2 <<EOF
+ERROR: Unsupported hook type '$HOOK_TYPE'.
+Usage: ./$SCRIPT_NAME [pre-commit|pre-push]
+EOF
+  exit 1
+fi

.rubocop_todo/layout/line_length.yml

@@ -1986,7 +1986,6 @@ Layout/LineLength:
     - 'ee/spec/services/quick_actions/interpret_service_spec.rb'
     - 'ee/spec/services/requirements_management/export_csv_service_spec.rb'
     - 'ee/spec/services/resource_events/change_weight_service_spec.rb'
-    - 'ee/spec/services/search/global_service_spec.rb'
     - 'ee/spec/services/search/snippet_service_spec.rb'
     - 'ee/spec/services/security/ingestion/finding_map_collection_spec.rb'
     - 'ee/spec/services/security/ingestion/ingest_report_service_spec.rb'
@@ -3865,7 +3864,6 @@ Layout/LineLength:
     - 'spec/requests/api/feature_flags_spec.rb'
     - 'spec/requests/api/features_spec.rb'
     - 'spec/requests/api/files_spec.rb'
-    - 'spec/requests/api/generic_packages_spec.rb'
     - 'spec/requests/api/go_proxy_spec.rb'
     - 'spec/requests/api/graphql/boards/board_list_issues_query_spec.rb'
     - 'spec/requests/api/graphql/boards/board_list_query_spec.rb'

.rubocop_todo/rails/strong_params.yml

@@ -325,7 +325,6 @@ Rails/StrongParams:
     - 'ee/app/controllers/security/projects_controller.rb'
     - 'ee/app/controllers/smartcard_controller.rb'
     - 'ee/app/controllers/subscriptions/groups_controller.rb'
-    - 'ee/app/controllers/subscriptions/hand_raise_leads_controller.rb'
     - 'ee/app/controllers/subscriptions_controller.rb'
     - 'ee/app/controllers/users/base_identity_verification_controller.rb'
     - 'ee/app/controllers/users/registrations_identity_verification_controller.rb'

.rubocop_todo/rspec/context_wording.yml

@@ -733,7 +733,6 @@ RSpec/ContextWording:
     - 'ee/spec/services/requirements_management/export_csv_service_spec.rb'
     - 'ee/spec/services/resource_access_tokens/create_service_spec.rb'
     - 'ee/spec/services/resource_access_tokens/revoke_service_spec.rb'
-    - 'ee/spec/services/search/global_service_spec.rb'
     - 'ee/spec/services/search/snippet_service_spec.rb'
     - 'ee/spec/services/security/ingestion/tasks/ingest_vulnerabilities/create_spec.rb'
     - 'ee/spec/services/security/ingestion/tasks/update_vulnerability_uuids_spec.rb'

GITALY_SERVER_VERSION

@@ -1 +1 @@
-6175a5f017f01e11959045c0dc24d9ca237865e6
+39a5e315d1b3e112db13930382d11061bfa95964

Gemfile.checksum

@@ -292,7 +292,7 @@
 {"name":"graphiql-rails","version":"1.10.0","platform":"ruby","checksum":"b557f989a737c8b9e985142609bec52fb1e9393a701eb50e02a7c14422891040"},
 {"name":"graphlient","version":"0.8.0","platform":"ruby","checksum":"98c408da1d083454e9f5e274f3b0b6261e2a0c2b5f2ed7b3ef9441d46f8e7cb1"},
 {"name":"graphlyte","version":"1.0.0","platform":"ruby","checksum":"b5af4ab67dde6e961f00ea1c18f159f73b52ed11395bb4ece297fe628fa1804d"},
-{"name":"graphql","version":"2.3.16","platform":"ruby","checksum":"6ac9966998914c5b470e527c7105d936db70af2306ec0445f88953404bce49c7"},
+{"name":"graphql","version":"2.3.17","platform":"ruby","checksum":"5e03655bf8ab07cd9710821f7f991ca6f5e86cf632261350ab185527169554e3"},
 {"name":"graphql-client","version":"0.23.0","platform":"ruby","checksum":"f238b8e451676baad06bd15f95396e018192243dcf12c4e6d13fb41d9a2babc1"},
 {"name":"graphql-docs","version":"5.0.0","platform":"ruby","checksum":"76baca6e5a803a4b6a9fbbbfdbf16742b7c4c546c8592b6e1a7aa4e79e562d04"},
 {"name":"grpc","version":"1.63.0","platform":"aarch64-linux","checksum":"dc75c5fd570b819470781d9512105dddfdd11d984f38b8e60bb946f92d1f79ee"},

Gemfile.lock

@@ -919,7 +919,7 @@ GEM
       faraday (~> 2.0)
       graphql-client
     graphlyte (1.0.0)
-    graphql (2.3.16)
+    graphql (2.3.17)
       base64
       fiber-storage
     graphql-client (0.23.0)

Gemfile.next.checksum

@@ -293,7 +293,7 @@
 {"name":"graphiql-rails","version":"1.10.0","platform":"ruby","checksum":"b557f989a737c8b9e985142609bec52fb1e9393a701eb50e02a7c14422891040"},
 {"name":"graphlient","version":"0.8.0","platform":"ruby","checksum":"98c408da1d083454e9f5e274f3b0b6261e2a0c2b5f2ed7b3ef9441d46f8e7cb1"},
 {"name":"graphlyte","version":"1.0.0","platform":"ruby","checksum":"b5af4ab67dde6e961f00ea1c18f159f73b52ed11395bb4ece297fe628fa1804d"},
-{"name":"graphql","version":"2.3.16","platform":"ruby","checksum":"6ac9966998914c5b470e527c7105d936db70af2306ec0445f88953404bce49c7"},
+{"name":"graphql","version":"2.3.17","platform":"ruby","checksum":"5e03655bf8ab07cd9710821f7f991ca6f5e86cf632261350ab185527169554e3"},
 {"name":"graphql-client","version":"0.23.0","platform":"ruby","checksum":"f238b8e451676baad06bd15f95396e018192243dcf12c4e6d13fb41d9a2babc1"},
 {"name":"graphql-docs","version":"5.0.0","platform":"ruby","checksum":"76baca6e5a803a4b6a9fbbbfdbf16742b7c4c546c8592b6e1a7aa4e79e562d04"},
 {"name":"grpc","version":"1.63.0","platform":"aarch64-linux","checksum":"dc75c5fd570b819470781d9512105dddfdd11d984f38b8e60bb946f92d1f79ee"},

Gemfile.next.lock

@@ -929,7 +929,7 @@ GEM
       faraday (~> 2.0)
       graphql-client
     graphlyte (1.0.0)
-    graphql (2.3.16)
+    graphql (2.3.17)
       base64
       fiber-storage
     graphql-client (0.23.0)

Guardfile

@@ -6,7 +6,7 @@ require "guard/rspec/dsl"
 
 cmd = ENV['GUARD_CMD'] || (ENV['SPRING'] ? 'spring rspec' : 'bundle exec rspec')
 
-directories %w[app ee keeps lib rubocop tooling spec]
+directories %w[app ee keeps lib rubocop scripts spec tooling]
 
 rspec_context_for = proc do |context_path|
   OpenStruct.new(to_s: "spec").tap do |rspec| # rubocop:disable Style/OpenStructUse
@@ -45,6 +45,7 @@ guard_setup = proc do |context_path|
   watch(%r{^#{context_path}(lib/.+)\.rb$}) { |m| rspec.spec.call(m[1]) }
   watch(%r{^#{context_path}(rubocop/.+)\.rb$}) { |m| rspec.spec.call(m[1]) }
   watch(%r{^#{context_path}(tooling/.+)\.rb$}) { |m| rspec.spec.call(m[1]) }
+  watch(%r{^#{context_path}(scripts/.+)\.rb$}) { |m| rspec.spec.call(m[1].tr('-', '_')) }
 
   # Rails files
   rails = rails_context_for.call(context_path, %w[erb haml slim])

app/assets/javascripts/batch_comments/components/preview_dropdown.vue

@@ -65,7 +65,7 @@ export default {
 
     <template #header>
       <div
-        class="gl-flex gl-min-h-8 gl-items-center gl-border-b-1 gl-border-b-gray-200 !gl-p-4 gl-border-b-solid"
+        class="gl-flex gl-min-h-8 gl-items-center gl-border-b-1 gl-border-b-dropdown !gl-p-4 gl-border-b-solid"
       >
         <span class="gl-grow gl-pr-2 gl-text-sm gl-font-bold">
           {{ n__('%d pending comment', '%d pending comments', draftsCount) }}

app/assets/javascripts/boards/components/board_column.vue

@@ -133,6 +133,7 @@ export default {
           :column-index="columnIndex"
           @toggleNewForm="toggleNewForm"
           @setFilters="$emit('setFilters', $event)"
+          @cannot-find-active-item="$emit('cannot-find-active-item')"
         />
       </div>
       <div

app/assets/javascripts/boards/components/board_content.vue

@@ -7,6 +7,7 @@ import BoardAddNewColumn from 'ee_else_ce/boards/components/board_add_new_column
 import BoardAddNewColumnTrigger from '~/boards/components/board_add_new_column_trigger.vue';
 import WorkItemDrawer from '~/work_items/components/work_item_drawer.vue';
 import { s__ } from '~/locale';
+import { removeParams, updateHistory } from '~/lib/utils/url_utility';
 import { defaultSortableOptions, DRAG_DELAY } from '~/sortable/constants';
 import { mapWorkItemWidgetsToIssuableFields } from '~/issues/list/utils';
 import {
@@ -19,6 +20,7 @@ import {
   DEFAULT_BOARD_LIST_ITEMS_SIZE,
   BoardType,
 } from 'ee_else_ce/boards/constants';
+import { DETAIL_VIEW_QUERY_PARAM_NAME } from '~/work_items/constants';
 import { calculateNewPosition } from 'ee_else_ce/boards/boards_util';
 import { setError } from '../graphql/cache_updates';
 import BoardColumn from './board_column.vue';
@@ -88,6 +90,7 @@ export default {
     return {
       boardHeight: null,
       highlightedLists: [],
+      columnsThatCannotFindActiveItem: 0,
     };
   },
   computed: {
@@ -245,6 +248,14 @@ export default {
     isLastList(index) {
       return this.boardListsToUse.length - 1 === index;
     },
+    handleCannotFindActiveItem() {
+      this.columnsThatCannotFindActiveItem += 1;
+      if (this.columnsThatCannotFindActiveItem === this.boardListsToUse.length) {
+        updateHistory({
+          url: removeParams([DETAIL_VIEW_QUERY_PARAM_NAME]),
+        });
+      }
+    },
   },
 };
 </script>
@@ -281,6 +292,7 @@ export default {
         @setActiveList="$emit('setActiveList', $event)"
         @setFilters="$emit('setFilters', $event)"
         @addNewListAfter="$emit('setAddColumnFormVisibility', $event)"
+        @cannot-find-active-item="handleCannotFindActiveItem"
       />
 
       <transition mode="out-in" name="slide" @after-enter="afterFormEnters">

app/assets/javascripts/boards/components/board_list.vue

@@ -7,6 +7,7 @@ import { ESC_KEY_CODE } from '~/lib/utils/keycodes';
 import { defaultSortableOptions, DRAG_DELAY } from '~/sortable/constants';
 import { sortableStart, sortableEnd } from '~/sortable/utils';
 import Tracking from '~/tracking';
+import { getParameterByName } from '~/lib/utils/url_utility';
 import listQuery from 'ee_else_ce/boards/graphql/board_lists_deferred.query.graphql';
 import setActiveBoardItemMutation from 'ee_else_ce/boards/graphql/client/set_active_board_item.mutation.graphql';
 import BoardNewIssue from 'ee_else_ce/boards/components/board_new_issue.vue';
@@ -18,6 +19,7 @@ import {
   listIssuablesQueries,
   ListType,
 } from 'ee_else_ce/boards/constants';
+import { DETAIL_VIEW_QUERY_PARAM_NAME } from '~/work_items/constants';
 import {
   addItemToList,
   removeItemFromList,
@@ -90,6 +92,7 @@ export default {
       addItemToListInProgress: false,
       updateIssueOrderInProgress: false,
       dragCancelled: false,
+      hasMadeDrawerAttempt: false,
     };
   },
   apollo: {
@@ -128,6 +131,28 @@ export default {
           message: s__('Boards|An error occurred while fetching a list. Please try again.'),
         });
       },
+      result({ data }) {
+        if (this.hasMadeDrawerAttempt) {
+          return;
+        }
+        const queryParam = getParameterByName(DETAIL_VIEW_QUERY_PARAM_NAME);
+
+        if (!data || !queryParam) {
+          return;
+        }
+
+        const { iid, full_path: fullPath } = JSON.parse(atob(queryParam));
+        const boardItem = this.boardListItems.find(
+          (item) => item.iid === iid && item.referencePath.includes(fullPath),
+        );
+
+        if (boardItem) {
+          this.setActiveWorkItem(boardItem);
+        } else {
+          this.$emit('cannot-find-active-item');
+        }
+        this.hasMadeDrawerAttempt = true;
+      },
     },
     toList: {
       query() {
@@ -603,16 +628,19 @@ export default {
         });
       } finally {
         this.addItemToListInProgress = false;
-        this.$apollo.mutate({
-          mutation: setActiveBoardItemMutation,
-          variables: {
-            boardItem: issuable,
-            listId: this.list.id,
-            isIssue: this.isIssueBoard,
-          },
-        });
+        this.setActiveWorkItem(issuable);
       }
     },
+    setActiveWorkItem(boardItem) {
+      this.$apollo.mutate({
+        mutation: setActiveBoardItemMutation,
+        variables: {
+          boardItem,
+          listId: this.list.id,
+          isIssue: this.isIssueBoard,
+        },
+      });
+    },
   },
 };
 </script>

app/assets/javascripts/ci/artifacts/components/job_artifacts_table.vue

@@ -145,14 +145,18 @@ export default {
       return Number(this.pageInfo.hasNextPage);
     },
     fields() {
-      return [
-        this.canBulkDestroyArtifacts && {
-          key: 'checkbox',
-          label: '',
-          thClass: 'gl-w-1/20',
-        },
-        ...this.$options.fields,
-      ];
+      if (this.canBulkDestroyArtifacts) {
+        return [
+          {
+            key: 'checkbox',
+            label: '',
+            thClass: 'gl-w-1/20',
+          },
+          ...this.$options.fields,
+        ];
+      }
+
+      return this.$options.fields;
     },
     anyArtifactsSelected() {
       return Boolean(this.selectedArtifacts.length);

app/assets/javascripts/ci/pipeline_mini_graph/legacy_pipeline_mini_graph/legacy_job_item.vue

@@ -180,7 +180,7 @@ export default {
     :data-testid="testid"
   >
     <template #list-item>
-      <div class="-gl-my-1 -gl-ml-2 gl-flex gl-items-center gl-justify-between">
+      <div class="-gl-my-2 -gl-ml-2 gl-flex gl-items-center gl-justify-between">
         <job-name-component
           v-gl-tooltip.viewport.left
           :title="tooltipText"

app/assets/javascripts/ci/pipeline_mini_graph/legacy_pipeline_mini_graph/legacy_pipeline_stage.vue

@@ -137,7 +137,7 @@ export default {
 
     <template #header>
       <div
-        class="gl-flex gl-min-h-8 gl-items-center gl-border-b-1 gl-border-b-gray-200 !gl-p-4 gl-text-sm gl-font-bold gl-leading-1 gl-border-b-solid"
+        class="gl-flex gl-min-h-8 gl-items-center gl-border-b-1 gl-border-b-dropdown !gl-p-4 gl-text-sm gl-font-bold gl-leading-1 gl-border-b-solid"
       >
         <template v-if="isLoading">
           <span>{{ $options.i18n.stage }}</span>

app/assets/javascripts/ci/pipeline_mini_graph/pipeline_stage.vue

@@ -133,7 +133,7 @@ export default {
     <template #header>
       <div
         data-testid="pipeline-stage-dropdown-menu-title"
-        class="gl-flex gl-min-h-8 gl-items-center gl-border-b-1 gl-border-b-gray-200 !gl-p-4 gl-text-sm gl-font-bold gl-leading-1 gl-border-b-solid"
+        class="gl-flex gl-min-h-8 gl-items-center gl-border-b-1 gl-border-b-dropdown !gl-p-4 gl-text-sm gl-font-bold gl-leading-1 gl-border-b-solid"
       >
         <span>{{ dropdownHeaderText }}</span>
       </div>