Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

.gitlab-ci.yml

@@ -218,7 +218,6 @@ variables:
   BUNDLER_CHECKSUM_VERIFICATION_OPT_IN: "1"
   CACHE_CLASSES: "true"
   CHECK_PRECOMPILED_ASSETS: "true"
-  FF_USE_FASTZIP: "true"
   RETRY_FAILED_TESTS_IN_NEW_PROCESS: "true"
   # Run with decomposed databases by default
   DECOMPOSED_DB: "true"
@@ -231,11 +230,6 @@ variables:
   REVIEW_APPS_GCP_PROJECT: "gitlab-review-apps"
   REVIEW_APPS_GCP_REGION: "us-central1"
 
-  CACHE_ASSETS_AS_PACKAGE: "true"
-  REUSE_FRONTEND_FIXTURES_ENABLED: "true"
-  BUILD_ASSETS_IMAGE: "true"  # Set it to "false" to disable assets image building, used in `build-assets-image`
-  SIMPLECOV: "true"
-
   REGISTRY_HOST: "registry.gitlab.com"
   REGISTRY_GROUP: "gitlab-org"
 
@@ -250,6 +244,15 @@ variables:
   # https://github.com/ruby/ruby/pull/7663 lands in the Ruby interpreter.
   NOKOGIRI_LIBXML_MEMORY_MANAGEMENT: default
 
+  # CI jobs behavior can be changed by changing the value of these variables in the project's CI/CD variables
+  AVERAGE_KNAPSACK_REPORT: "true"
+  ENABLE_DEPSASTER: "true"
+  ENABLE_DEPSCORE: "true"
+  CACHE_ASSETS_AS_PACKAGE: "true"
+  REUSE_FRONTEND_FIXTURES_ENABLED: "true"
+  BUILD_ASSETS_IMAGE: "true"  # Set it to "false" to disable assets image building, used in `build-assets-image`
+  SIMPLECOV: "true"
+
 include:
   - local: .gitlab/ci/_skip.yml
     rules:

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

@@ -2534,7 +2534,7 @@
 
 .static-analysis:rules:trigger-depsaster:
   rules:
-    - if: $ENABLE_DEPSASTER != 'true'
+    - if: "$ENABLE_DEPSASTER != 'true'"
       when: never
     - <<: *if-fork-merge-request
       when: never
@@ -2565,10 +2565,12 @@
   rules:
     # Requiring $DEPENDENCY_REVIEW_PAT prevents the bot from running on forks or CE
     # Without it the script would fail too.
-    - if: $ENABLE_DEPSCORE != 'true'
+    - if: "$ENABLE_DEPSCORE != 'true'"
       when: never
     - if: "$DEPENDENCY_REVIEW_PAT == null"
       when: never
+    - <<: *if-fork-merge-request
+      when: never
     - <<: *if-not-ee
       when: never
     # Run only when the merge request have dependency file modifications

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

@@ -158,6 +158,8 @@ export default {
       activeProject: undefined,
       hasScannerError: false,
       pinnedFileStatus: '',
+      codequalityData: {},
+      sastData: {},
     };
   },
   apollo: {
@@ -192,14 +194,11 @@ export default {
         }
 
         if (codequalityReportsComparer?.report?.newErrors) {
-          this.$store.commit(
-            'diffs/SET_CODEQUALITY_DATA',
-            sortFindingsByFile(codequalityReportsComparer.report.newErrors),
-          );
+          this.codequalityData = sortFindingsByFile(codequalityReportsComparer.report.newErrors);
         }
 
         if (sastReport?.report) {
-          this.$store.commit('diffs/SET_SAST_DATA', sastReport.report);
+          this.sastData = sastReport.report;
         }
       },
       error() {
@@ -759,6 +758,8 @@ export default {
                 >
                   <diff-file
                     :file="item"
+                    :codequality-data="codequalityData"
+                    :sast-data="sastData"
                     :reviewed="fileReviews[item.id]"
                     :is-first-file="index === 0"
                     :is-last-file="index === diffFilesLength - 1"
@@ -778,6 +779,8 @@ export default {
                 v-for="(file, index) in diffs"
                 :key="file.new_path"
                 :file="file"
+                :codequality-data="codequalityData"
+                :sast-data="sastData"
                 :reviewed="fileReviews[file.id]"
                 :is-first-file="index === 0"
                 :is-last-file="index === diffFilesLength - 1"

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

@@ -47,16 +47,20 @@ export default {
       required: false,
       default: '',
     },
+    codequalityData: {
+      type: Object,
+      required: false,
+      default: null,
+    },
+    sastData: {
+      type: Object,
+      required: false,
+      default: null,
+    },
   },
   computed: {
     ...mapState('diffs', ['projectPath']),
-    ...mapGetters('diffs', [
-      'isInlineView',
-      'getCommentFormForDiffFile',
-      'diffLines',
-      'fileLineCodequality',
-      'fileLineSast',
-    ]),
+    ...mapGetters('diffs', ['isInlineView', 'getCommentFormForDiffFile', 'diffLines']),
     ...mapGetters(['getNoteableData', 'noteableType', 'getUserData']),
     diffMode() {
       return getDiffMode(this.diffFile);
@@ -92,7 +96,10 @@ export default {
       return this.getUserData;
     },
     mappedLines() {
-      return this.diffLines(this.diffFile).map(mapParallel(this)) || [];
+      return (
+        this.diffLines(this.diffFile).map(mapParallel(this, this.codequalityData, this.sastData)) ||
+        []
+      );
     },
     imageDiscussions() {
       return this.diffFile.discussions.filter(
@@ -145,6 +152,8 @@ export default {
       <template v-if="isTextFile">
         <diff-view
           :diff-file="diffFile"
+          :codequality-data="codequalityData"
+          :sast-data="sastData"
           :diff-lines="mappedLines"
           :help-page-path="helpPagePath"
           :inline="isInlineView"

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

@@ -90,6 +90,16 @@ export default {
       required: false,
       default: true,
     },
+    codequalityData: {
+      type: Object,
+      required: false,
+      default: null,
+    },
+    sastData: {
+      type: Object,
+      required: false,
+      default: null,
+    },
   },
   idState() {
     return {
@@ -104,12 +114,7 @@ export default {
     genericError: SOMETHING_WENT_WRONG,
   },
   computed: {
-    ...mapState('diffs', [
-      'currentDiffFileId',
-      'codequalityDiff',
-      'conflictResolutionPath',
-      'canMerge',
-    ]),
+    ...mapState('diffs', ['currentDiffFileId', 'conflictResolutionPath', 'canMerge']),
     ...mapGetters(['isNotesFetched', 'getNoteableData', 'noteableType']),
     ...mapGetters('diffs', ['getDiffFileDiscussions', 'isVirtualScrollingEnabled', 'pinnedFile']),
     isPinnedFile() {
@@ -553,6 +558,8 @@ export default {
           <diff-content
             v-if="showContent"
             :class="hasBodyClasses.content"
+            :codequality-data="codequalityData"
+            :sast-data="sastData"
             :diff-file="file"
             :help-page-path="helpPagePath"
             @load-file="requestDiff"

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

@@ -45,6 +45,16 @@ export default {
       required: false,
       default: false,
     },
+    codequalityData: {
+      type: Object,
+      required: false,
+      default: null,
+    },
+    sastData: {
+      type: Object,
+      required: false,
+      default: null,
+    },
   },
   idState() {
     return {
@@ -54,13 +64,7 @@ export default {
   },
   computed: {
     ...mapGetters('diffs', ['commitId', 'fileLineCoverage']),
-    ...mapState('diffs', [
-      'codequalityDiff',
-      'sastDiff',
-      'highlightedRow',
-      'coverageLoaded',
-      'selectedCommentPosition',
-    ]),
+    ...mapState('diffs', ['highlightedRow', 'coverageLoaded', 'selectedCommentPosition']),
     ...mapState({
       selectedCommentPosition: ({ notes }) => notes.selectedCommentPosition,
       selectedCommentPositionHover: ({ notes }) => notes.selectedCommentPositionHover,
@@ -76,8 +80,8 @@ export default {
     },
     hasInlineFindingsChanges() {
       return (
-        this.codequalityDiff?.files?.[this.diffFile.file_path]?.length > 0 ||
-        this.sastDiff?.added?.length > 0
+        this.codequalityData?.files?.[this.diffFile.file_path]?.length > 0 ||
+        this.sastData?.added?.length > 0
       );
     },
   },

app/assets/javascripts/diffs/store/getters.js

@@ -149,16 +149,6 @@ export const fileLineCoverage = (state) => (file, line) => {
   return {};
 };
 
-// This function is overwritten for the inline codequality feature in EE
-export const fileLineCodequality = () => () => {
-  return null;
-};
-
-// This function is overwritten for the inline SAST feature in EE
-export const fileLineSast = () => () => {
-  return null;
-};
-
 /**
  * Returns index of a currently selected diff in diffFiles
  * @returns {number}

app/assets/javascripts/diffs/store/modules/index.js

@@ -1,7 +1,7 @@
-import * as getters from 'ee_else_ce/diffs/store/getters';
-import createState from 'ee_else_ce/diffs/store/modules/diff_state';
-import mutations from 'ee_else_ce/diffs/store/mutations';
+import * as getters from '../getters';
+import mutations from '../mutations';
 import * as actions from '../actions';
+import createState from './diff_state';
 
 export default () => ({
   namespaced: true,

app/assets/javascripts/ml/model_registry/apps/index_ml_models.vue

@@ -6,7 +6,7 @@ import { helpPagePath } from '~/helpers/help_page_helper';
 import * as Sentry from '~/sentry/sentry_browser_wrapper';
 import EmptyState from '../components/empty_state.vue';
 import * as i18n from '../translations';
-import { BASE_SORT_FIELDS, GRAPHQL_PAGE_SIZE, MODEL_ENTITIES } from '../constants';
+import { BASE_SORT_FIELDS, MODEL_ENTITIES } from '../constants';
 import ModelRow from '../components/model_row.vue';
 import ActionsDropdown from '../components/actions_dropdown.vue';
 import getModelsQuery from '../graphql/queries/get_models.query.graphql';
@@ -62,12 +62,17 @@ export default {
       error(error) {
         this.handleError(error);
       },
+      skip() {
+        return this.skipQueries;
+      },
     },
   },
   data() {
     return {
       models: [],
       errorMessage: undefined,
+      skipQueries: true,
+      queryVariables: {},
     };
   },
   computed: {
@@ -83,31 +88,21 @@ export default {
     isLoading() {
       return this.$apollo.queries.models.loading;
     },
-    queryVariables() {
-      return {
-        fullPath: this.projectPath,
-        first: GRAPHQL_PAGE_SIZE,
-      };
-    },
   },
   methods: {
     fetchPage(variables) {
-      const vars = {
-        ...this.queryVariables,
+      this.queryVariables = {
+        fullPath: this.projectPath,
         ...variables,
         name: variables.name,
         orderBy: variables.orderBy?.toUpperCase() || 'CREATED_AT',
         sort: variables.sort?.toUpperCase() || 'DESC',
       };
 
-      this.$apollo.queries.models
-        .fetchMore({
-          variables: vars,
-          updateQuery: (previousResult, { fetchMoreResult }) => {
-            return fetchMoreResult;
-          },
-        })
-        .catch(this.handleError);
+      this.errorMessage = null;
+      this.skipQueries = false;
+
+      this.$apollo.queries.models.fetchMore({});
     },
     handleError(error) {
       this.errorMessage = makeLoadModelErrorMessage(error.message);

app/services/concerns/update_repository_storage_methods.rb

@@ -28,10 +28,7 @@ def execute
 
     unless same_filesystem?
       mirror_repositories
-
-      repository_storage_move.transaction do
-        mirror_object_pool(destination_storage_name)
-      end
+      mirror_object_pool(destination_storage_name)
     end
 
     repository_storage_move.finish_replication!

app/services/projects/update_repository_storage_service.rb

@@ -49,8 +49,14 @@ def mirror_object_pool(destination_storage_name)
         pool_repository: pool_repository
       )
 
-      Repositories::ReplicateService.new(pool_repository.object_pool.repository)
-        .execute(target_pool_repository.object_pool.repository, :object_pool)
+      begin
+        Repositories::ReplicateService.new(pool_repository.object_pool.repository)
+          .execute(target_pool_repository.object_pool.repository, :object_pool)
+      rescue StandardError => e
+        target_pool_repository.destroy!
+
+        raise e
+      end
     end
 
     def remove_old_paths

doc/administration/reference_architectures/10k_users.md

@@ -644,9 +644,6 @@ in the second step, do not supply the `EXTERNAL_URL` value.
    patroni['username'] = '<patroni_api_username>'
    patroni['password'] = '<patroni_api_password>'
 
-   # Replace 10.6.0.0/24 with Network Addresses for your other patroni nodes
-   patroni['allowlist'] = %w(10.6.0.0/24 127.0.0.1/32)
-
    # Replace 10.6.0.0/24 with Network Address
    postgresql['trust_auth_cidr_addresses'] = %w(10.6.0.0/24 127.0.0.1/32)
 

doc/administration/reference_architectures/25k_users.md

@@ -652,9 +652,6 @@ in the second step, do not supply the `EXTERNAL_URL` value.
    patroni['username'] = '<patroni_api_username>'
    patroni['password'] = '<patroni_api_password>'
 
-   # Replace 10.6.0.0/24 with Network Addresses for your other patroni nodes
-   patroni['allowlist'] = %w(10.6.0.0/24 127.0.0.1/32)
-
    # Replace 10.6.0.0/24 with Network Address
    postgresql['trust_auth_cidr_addresses'] = %w(10.6.0.0/24 127.0.0.1/32)
 

doc/administration/reference_architectures/3k_users.md

@@ -918,9 +918,6 @@ in the second step, do not supply the `EXTERNAL_URL` value.
    patroni['username'] = '<patroni_api_username>'
    patroni['password'] = '<patroni_api_password>'
 
-   # Replace 10.6.0.0/24 with Network Addresses for your other patroni nodes
-   patroni['allowlist'] = %w(10.6.0.0/24 127.0.0.1/32)
-
    # Replace 10.6.0.0/24 with Network Address
    postgresql['trust_auth_cidr_addresses'] = %w(10.6.0.0/24 127.0.0.1/32)
 

doc/administration/reference_architectures/50k_users.md

@@ -654,9 +654,6 @@ in the second step, do not supply the `EXTERNAL_URL` value.
    patroni['username'] = '<patroni_api_username>'
    patroni['password'] = '<patroni_api_password>'
 
-   # Replace 10.6.0.0/24 with Network Addresses for your other patroni nodes
-   patroni['allowlist'] = %w(10.6.0.0/24 127.0.0.1/32)
-
    # Replace 10.6.0.0/24 with Network Address
    postgresql['trust_auth_cidr_addresses'] = %w(10.6.0.0/24 127.0.0.1/32)