Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

.gitlab-ci.yml

@@ -336,6 +336,3 @@ include:
     rules:
       - *if-merge-request-labels-run-with-rails-next
       - *if-rails-next-schedule
-  - local: .gitlab/ci/overrides/assets-tmp-cache.yml
-    rules:
-      - if: '$CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH && $CI_PIPELINE_SOURCE == "push"'

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

@@ -461,12 +461,17 @@
     - ${GLCI_GITLAB_ASSETS_HASH_FILE}
   policy: pull-push
 
+# unlike rubocop, webpack cache does not have built in cleanup so it's not safe to use in pull-push configuration
+# add periodic cache invalidation based on checksum of config file and dependency lock file until migration to Vite is complete
 .assets-tmp-cache: &assets-tmp-cache
-  key: "partial-assets-cache-${NODE_ENV}-${OS_VERSION}-node-${NODE_VERSION}-vue-${VUE_VERSION}"
+  key:
+    files:
+      - config/webpack.config.js
+      - yarn.lock
+    prefix: "partial-assets-cache-${NODE_ENV}-${OS_VERSION}-node-${NODE_VERSION}-vue-${VUE_VERSION}-${CI_COMMIT_REF_SLUG}"
   paths:
     - tmp/cache
-  policy: pull
-  unprotect: true # push this cache from master pipelines to reuse as partial cache in mr pipelines
+  policy: pull-push
 
 # used in jobs like gdk:compile-test-assets which is just a copy of compile-test-assets
 .assets-cache-pull: &assets-cache-pull
@@ -487,17 +492,16 @@
   policy: pull-push
 
 .rubocop-cache: &rubocop-cache
-  key: "rubocop-${BUILD_OS}-${OS_VERSION}-ruby-${RUBY_VERSION}-gemfile-${BUNDLE_GEMFILE}"
+  key: "rubocop-${BUILD_OS}-${OS_VERSION}-ruby-${RUBY_VERSION}-gemfile-${BUNDLE_GEMFILE}-${CI_COMMIT_REF_SLUG}"
   paths:
     - tmp/rubocop_cache/
   policy: pull
-  unprotect: true # push this cache from master pipelines to reuse as partial cache in mr pipelines
 
 .rubocop-cache-push: &rubocop-cache-push
   <<: *rubocop-cache
   # We want to rebuild the cache from scratch to ensure stale dependencies are cleaned up but RuboCop has a mechanism
   # for keeping only the N latest cache files, so we take advantage of it with `pull-push`.
-  policy: push
+  policy: pull-push
 
 .workhorse-cache: &workhorse-cache
   key: "workhorse-${BUILD_OS}-${OS_VERSION}-${GLCI_WORKHORSE_HASH}"
@@ -579,17 +583,18 @@
   extends: .cache-analytics
   cache:
     - !reference [.ruby-gems-cache]
-    - !reference [.assets-tmp-cache] # use reference to be able to override via overrides/assets-tmp-cache.yml
     - *node-modules-cache
     - *assets-cache
+    - *assets-tmp-cache
 
 .assets-compile-cache-pull: # this cache is used only for gdk:compile-test-assets which should only pull, never push
   extends: .cache-analytics
   cache:
     - !reference [.ruby-gems-cache]
     - *node-modules-cache
     - *assets-cache-pull
-    - *assets-tmp-cache
+    - <<: *assets-tmp-cache
+      policy: pull
 
 .storybook-yarn-cache:
   cache:

.gitlab/ci/overrides/assets-tmp-cache.yml

@@ -1212,25 +1212,6 @@
 #################
 # Caching rules #
 #################
-# rules for updating unprotected caches via maintenance schedule pipelines
-.caching:rules:update-master-based-caches:
-  rules:
-    - <<: *if-schedule-maintenance
-    - <<: *if-security-schedule
-    - <<: *if-foss-schedule
-    - <<: *if-merge-request-labels-update-caches
-
-.caching:rules:rubocop-cache-update:
-  rules:
-    - !reference [.caching:rules:update-master-based-caches, rules]
-    - *if-rails-next-branch
-    - <<: *if-default-branch-push
-      changes:
-        - '**/*.rb'
-        - '**/*.rake'
-        - '.rubocop_todo/**/*.yml'
-        - '.rubocop.yml'
-
 # This rule is used by pull-push cache jobs to ensure pipeline always has cache populated
 # All caches are generally related to app code, so limit cache jobs to code-backstage-patterns
 .caching:rules:update-cache-on-code-changes:

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

@@ -12,21 +12,6 @@
     BROWSERSLIST_IGNORE_OLD_DATA: "true"
     GRAPHQL_SCHEMA_APOLLO_FILE: "tmp/tests/graphql/gitlab_schema_apollo.graphql"
 
-update-static-analysis-cache:
-  extends:
-    - .static-analysis-base
-    - .rubocop-job-cache-push
-    - .caching:rules:rubocop-cache-update
-  stage: prepare
-  needs:
-    - job: cache:ruby-gems
-      optional: true
-  script:
-    # Silence cop offenses for rules with "grace period".
-    # This will notify Slack if offenses were silenced.
-    # For the moment we only cache `tmp/rubocop_cache` so we don't need to run all the tasks.
-    - fail_on_warnings bundle exec rake rubocop:check:graceful
-
 static-analysis:
   extends:
     - .static-analysis-base
@@ -133,7 +118,7 @@ haml-lint:
 rubocop:
   extends:
     - .static-analysis-base
-    - .rubocop-job-cache
+    - .rubocop-job-cache-push
     - .static-analysis:rules:rubocop
   needs:
     - job: detect-tests
@@ -144,10 +129,11 @@ rubocop:
     - |
       # For non-merge request, or when RUN_ALL_RUBOCOP is 'true', run all RuboCop rules
       if [ -z "${CI_MERGE_REQUEST_IID:-$FIND_CHANGES_MERGE_REQUEST_IID}" ] || [ "${RUN_ALL_RUBOCOP}" == "true" ]; then
-        # Silence cop offenses for rules with "grace period".
-        # We won't notify Slack if offenses were silenced to avoid frequent messages.
-        # Job `update-static-analysis-cache` takes care of Slack notifications every 2 hours.
-        unset CI_SLACK_WEBHOOK_URL
+        if [ "${CI_PIPELINE_SOURCE}" != "schedule" ]; then
+          # Silence cop offenses for rules with "grace period".
+          # To avoid frequent notification, unset slack webhook url for everything but scheduled pipelines
+          unset CI_SLACK_WEBHOOK_URL
+        fi
         fail_on_warnings bundle exec rake rubocop:check:graceful
       else
         select_existing_files < "${GLCI_PREDICTIVE_CHANGED_FILES_PATH}" > "${RUBOCOP_TARGET_FILES}"

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

@@ -4,7 +4,7 @@ variables:
   DOCKER_VERSION: "27.4.1"
   EXIFTOOL_VERSION: "12.60"
   GCLOUD_VERSION: "413"
-  GIT_VERSION: "2.49"
+  GIT_VERSION: "2.51"
   GO_VERSION: "1.23"
   GRAPHICSMAGICK_VERSION: "1.3.36"
   HELM_VERSION: "3.16"

.gitlab/ci/version.yml

@@ -46,7 +46,7 @@ workhorse:test go:
   extends: .workhorse:test
   parallel:
     matrix:
-      - GO_VERSION: ["1.22", "1.23", "1.24"]
+      - GO_VERSION: ["1.23", "1.24", "1.25"]
         REDIS_VERSION: ["7.0", "6.2"]
   script:
     - make -C workhorse test-coverage
@@ -70,7 +70,7 @@ workhorse:test fips:
     - setup-test-env-fips
   parallel:
     matrix:
-      - GO_VERSION: ["1.22", "1.23", "1.24"]
+      - GO_VERSION: ["1.23", "1.24", "1.25"]
         REDIS_VERSION: ["7.0", "6.2"]
   image: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images/${BUILD_OS}-${OS_VERSION}-ruby-${RUBY_VERSION}-golang-${GO_VERSION}-rust-${RUST_VERSION}:rubygems-${RUBYGEMS_VERSION}-git-${GIT_VERSION}-exiftool-${EXIFTOOL_VERSION}
   variables:

.gitlab/ci/workhorse.gitlab-ci.yml

@@ -793,7 +793,6 @@ RSpec/BeEq:
     - 'spec/lib/gitlab/git/diff_collection_spec.rb'
     - 'spec/lib/gitlab/git/diff_spec.rb'
     - 'spec/lib/gitlab/git/hook_env_spec.rb'
-    - 'spec/lib/gitlab/git/repository_spec.rb'
     - 'spec/lib/gitlab/gitaly_client/commit_service_spec.rb'
     - 'spec/lib/gitlab/gitaly_client/diff_blobs_stitcher_spec.rb'
     - 'spec/lib/gitlab/gitaly_client_spec.rb'

.rubocop_todo/rspec/be_eq.yml

@@ -489,7 +489,7 @@ export default {
       variant="danger"
       :dismissible="false"
       data-testid="conflictsAlert"
-      class="gl-rounded-t-base"
+      class="gl-rounded-b-none gl-rounded-t-base"
     >
       {{ $options.CONFLICT_TEXT[file.conflict_type] }}
       <template v-if="!canMerge">

app/assets/javascripts/diffs/components/diff_file.vue

@@ -1,13 +1,16 @@
 <script>
-import { GlBanner } from '@gitlab/ui';
+import { GlBanner, GlLink, GlSprintf } from '@gitlab/ui';
 import UserCalloutDismisser from '~/vue_shared/components/user_callout_dismisser.vue';
 
 export default {
   components: {
     GlBanner,
+    GlLink,
+    GlSprintf,
     UserCalloutDismisser,
   },
   preferencesLink: '/-/profile/preferences#behavior',
+  buttonAttributes: { hidden: true },
 };
 </script>
 
@@ -19,17 +22,23 @@ export default {
           v-if="shouldShowCallout"
           :title="s__('Homepage|Welcome to the new homepage')"
           class="homepage-duo-core-banner gl-mb-5 gl-bg-white"
-          :button-text="s__('Homepage|Go to preferences')"
-          :button-link="$options.preferencesLink"
+          button-text=""
+          :button-attributes="$options.buttonAttributes"
           @close="dismiss"
         >
-          <p>
-            {{
+          <gl-sprintf
+            :message="
               s__(
-                "Homepage|We're introducing a new way for you to get an overview of your work, so you can plan what to work on next. The homepage is now the default for everyone. If you prefer to change your default homepage, you can update your user preferences.",
+                `Homepage|We're introducing a new way for you to get an overview of your work, so you can plan what to work on next. The homepage is now the default for everyone. If you prefer to change your default homepage, you can %{linkStart}update your user preferences%{linkEnd}.`,
               )
-            }}
-          </p>
+            "
+          >
+            <template #link="{ content }">
+              <gl-link :href="$options.preferencesLink" data-testid="go-to-preferences-link">{{
+                content
+              }}</gl-link>
+            </template>
+          </gl-sprintf>
         </gl-banner>
       </template>
     </user-callout-dismisser>