Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

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

@@ -305,7 +305,7 @@ rspec-ee unit clickhouse:
     - .rspec-base-pg14-clickhouse23
     - .rails:rules:clickhouse-changes
 
-gitlab:clickhouse:rollback:
+gitlab:clickhouse:rollback:main:
   extends:
     - .rspec-base
     - .production  # Disable webmock from test environment
@@ -317,7 +317,7 @@ gitlab:clickhouse:rollback:
     - 'sed -i "s|test:$|production:|g" config/click_house.yml'
     - !reference [.base-script, script]
     - bundle exec rake gitlab:clickhouse:migrate &&
-      bundle exec rake gitlab:clickhouse:rollback VERSION=0
+      bundle exec rake gitlab:clickhouse:rollback:main VERSION=0
 
 gitlab:setup:
   extends: .db-job-base

GITALY_SERVER_VERSION

@@ -1 +1 @@
-fd52f0c5d44c30584f934ea7774d4024654b63a3
+2893c46338b2d070bfd8559d09e6c781131fb27f

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

@@ -5,8 +5,9 @@ import Pagination from '~/vue_shared/components/incubation/pagination.vue';
 import MetadataItem from '~/vue_shared/components/registry/metadata_item.vue';
 import TitleArea from '~/vue_shared/components/registry/title_area.vue';
 import { helpPagePath } from '~/helpers/help_page_helper';
+import EmptyState from '../components/empty_state.vue';
 import * as i18n from '../translations';
-import { BASE_SORT_FIELDS } from '../constants';
+import { BASE_SORT_FIELDS, MODEL_ENTITIES } from '../constants';
 import SearchBar from '../components/search_bar.vue';
 import ModelRow from '../components/model_row.vue';
 
@@ -19,6 +20,7 @@ export default {
     MetadataItem,
     TitleArea,
     GlBadge,
+    EmptyState,
   },
   props: {
     models: {
@@ -43,6 +45,7 @@ export default {
   i18n,
   sortableFields: BASE_SORT_FIELDS,
   docHref: helpPagePath('user/project/ml/model_registry/index.md'),
+  modelEntity: MODEL_ENTITIES.model,
 };
 </script>
 
@@ -67,6 +70,6 @@ export default {
       <pagination v-bind="pageInfo" />
     </template>
 
-    <p v-else class="gl-text-secondary">{{ $options.i18n.NO_MODELS_LABEL }}</p>
+    <empty-state v-else :entity-type="$options.modelEntity" />
   </div>
 </template>

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

@@ -3,13 +3,16 @@ import { GlTab, GlTabs, GlBadge } from '@gitlab/ui';
 import MetadataItem from '~/vue_shared/components/registry/metadata_item.vue';
 import TitleArea from '~/vue_shared/components/registry/title_area.vue';
 import ModelVersionDetail from '~/ml/model_registry/components/model_version_detail.vue';
+import { MODEL_ENTITIES } from '~/ml/model_registry/constants';
+import EmptyState from '../components/empty_state.vue';
 import * as i18n from '../translations';
 
 export default {
   name: 'ShowMlModelApp',
   components: {
     ModelVersionList: () => import('../components/model_version_list.vue'),
     CandidateList: () => import('../components/candidate_list.vue'),
+    EmptyState,
     TitleArea,
     GlTabs,
     GlTab,
@@ -35,6 +38,7 @@ export default {
     },
   },
   i18n,
+  modelVersionEntity: MODEL_ENTITIES.modelVersion,
 };
 </script>
 
@@ -59,7 +63,8 @@ export default {
           <h3 class="gl-font-lg">{{ latestVersionTitle }}</h3>
           <model-version-detail :model-version="model.latestVersion" />
         </template>
-        <div v-else class="gl-text-secondary">{{ $options.i18n.NO_VERSIONS_LABEL }}</div>
+
+        <empty-state v-else :entity-type="$options.modelVersionEntity" />
       </gl-tab>
       <gl-tab>
         <template #title>

app/assets/javascripts/ml/model_registry/components/empty_state.vue

@@ -0,0 +1,58 @@
+<script>
+import { GlEmptyState } from '@gitlab/ui';
+import emptySvgUrl from '@gitlab/svgs/dist/illustrations/empty-state/empty-dag-md.svg?url';
+import { helpPagePath } from '~/helpers/help_page_helper';
+import { s__ } from '~/locale';
+import { MODEL_ENTITIES } from '../constants';
+
+const emptyStateTranslations = {
+  [MODEL_ENTITIES.model]: {
+    title: s__('MlModelRegistry|Start tracking your machine learning models'),
+    description: s__('MlModelRegistry|Store and manage your machine learning models and versions'),
+    createNew: s__('MlModelRegistry|Add a model'),
+  },
+  [MODEL_ENTITIES.modelVersion]: {
+    title: s__('MlModelRegistry|Manage versions of your machine learning model'),
+    description: s__('MlModelRegistry|Use versions to track performance, parameters, and metadata'),
+    createNew: s__('MlModelRegistry|Create a model version'),
+  },
+};
+
+export default {
+  components: {
+    GlEmptyState,
+  },
+  props: {
+    entityType: {
+      type: String,
+      required: true,
+      validator(value) {
+        return MODEL_ENTITIES[value] !== undefined;
+      },
+    },
+  },
+  computed: {
+    emptyStateValues() {
+      return {
+        ...emptyStateTranslations[this.entityType],
+        helpPath: helpPagePath('user/project/ml/model_registry/index', {
+          anchor: 'creating-machine-learning-models-and-model-versions',
+        }),
+        emptySvgPath: emptySvgUrl,
+      };
+    },
+  },
+};
+</script>
+
+<template>
+  <gl-empty-state
+    :title="emptyStateValues.title"
+    :primary-button-text="emptyStateValues.createNew"
+    :primary-button-link="emptyStateValues.helpPath"
+    :svg-path="emptyStateValues.emptySvgPath"
+    :svg-height="null"
+    :description="emptyStateValues.description"
+    class="gl-py-8"
+  />
+</template>

app/assets/javascripts/ml/model_registry/components/model_version_list.vue

@@ -4,14 +4,16 @@ import { n__ } from '~/locale';
 import PackagesListLoader from '~/packages_and_registries/shared/components/packages_list_loader.vue';
 import RegistryList from '~/packages_and_registries/shared/components/registry_list.vue';
 import * as Sentry from '~/sentry/sentry_browser_wrapper';
-import { makeLoadVersionsErrorMessage, NO_VERSIONS_LABEL } from '~/ml/model_registry/translations';
+import { makeLoadVersionsErrorMessage } from '~/ml/model_registry/translations';
 import { convertToGraphQLId } from '~/graphql_shared/utils';
 import getModelVersionsQuery from '../graphql/queries/get_model_versions.query.graphql';
-import { GRAPHQL_PAGE_SIZE } from '../constants';
+import { GRAPHQL_PAGE_SIZE, MODEL_ENTITIES } from '../constants';
+import EmptyState from './empty_state.vue';
 import ModelVersionRow from './model_version_row.vue';
 
 export default {
   components: {
+    EmptyState,
     GlAlert,
     ModelVersionRow,
     PackagesListLoader,
@@ -104,9 +106,7 @@ export default {
       });
     },
   },
-  i18n: {
-    NO_VERSIONS_LABEL,
-  },
+  modelVersionEntity: MODEL_ENTITIES.modelVersion,
 };
 </script>
 <template>
@@ -117,9 +117,7 @@ export default {
     <gl-alert v-else-if="errorMessage" variant="danger" :dismissible="false">{{
       errorMessage
     }}</gl-alert>
-    <div v-else-if="isListEmpty" class="gl-text-secondary">
-      {{ $options.i18n.NO_VERSIONS_LABEL }}
-    </div>
+    <empty-state v-else-if="isListEmpty" :entity-type="$options.modelVersionEntity" />
     <div v-else>
       <registry-list
         :hidden-delete="true"

app/assets/javascripts/ml/model_registry/constants.js

@@ -13,3 +13,8 @@ export const BASE_SORT_FIELDS = Object.freeze([
 ]);
 
 export const GRAPHQL_PAGE_SIZE = 30;
+
+export const MODEL_ENTITIES = {
+  model: 'model',
+  modelVersion: 'modelVersion',
+};

app/assets/javascripts/ml/model_registry/translations.js

@@ -4,13 +4,11 @@ export const MODEL_DETAILS_TAB_LABEL = s__('MlModelRegistry|Details');
 export const MODEL_OTHER_VERSIONS_TAB_LABEL = s__('MlModelRegistry|Versions');
 export const MODEL_CANDIDATES_TAB_LABEL = s__('MlModelRegistry|Version candidates');
 export const LATEST_VERSION_LABEL = s__('MlModelRegistry|Latest version');
-export const NO_VERSIONS_LABEL = s__('MlModelRegistry|This model has no versions');
 
 export const versionsCountLabel = (versionCount) =>
   n__('MlModelRegistry|%d version', 'MlModelRegistry|%d versions', versionCount);
 
 export const TITLE_LABEL = s__('MlModelRegistry|Model registry');
-export const NO_MODELS_LABEL = s__('MlModelRegistry|No models registered in this project');
 
 export const modelsCountLabel = (modelCount) =>
   n__('MlModelRegistry|%d model', 'MlModelRegistry|%d models', modelCount);

app/models/ci/build.rb

@@ -231,7 +231,7 @@ def clone_accessors
            yaml_variables when environment coverage_regex
            description tag_list protected needs_attributes
            job_variables_attributes resource_group scheduling_type
-           ci_stage partition_id id_tokens].freeze
+           ci_stage partition_id id_tokens interruptible].freeze
       end
 
       def supported_keyset_orderings

config/feature_flags/ops/run_clickhouse_migrations_automatically.yml

@@ -0,0 +1,8 @@
+---
+name: run_clickhouse_migrations_automatically
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/138661
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/434848
+milestone: '16.7'
+type: ops
+group: group::runner
+default_enabled: false

db/click_house/migrate/20230705124511_create_events.rb renamed to db/click_house/migrate/main/20230705124511_create_events.rb

@@ -25,7 +25,7 @@ def up
 
     execute <<~SQL
       ALTER TABLE audit_events
-      ADD PROJECTION by_id (SELECT * ORDER BY id);
+      ADD PROJECTION IF NOT EXISTS by_id (SELECT * ORDER BY id);
     SQL
   end
 

db/click_house/migrate/20230707151359_create_ci_finished_builds.rb renamed to db/click_house/migrate/main/20230707151359_create_ci_finished_builds.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+class ScheduleIndexToCiBuildTraceMetadata < Gitlab::Database::Migration[2.2]
+  milestone '16.7'
+  disable_ddl_transaction!
+
+  INDEX_NAME = :index_ci_build_trace_metadata_on_trace_artifact_id_partition_id
+  TABLE_NAME = :ci_build_trace_metadata
+  COLUMNS = [:trace_artifact_id, :partition_id]
+
+  def up
+    prepare_async_index(TABLE_NAME, COLUMNS, name: INDEX_NAME)
+  end
+
+  def down
+    unprepare_async_index_by_name(TABLE_NAME, INDEX_NAME)
+  end
+end

db/click_house/migrate/20230719101806_create_ci_finished_builds_aggregated_queueing_delay_percentiles.rb renamed to db/click_house/migrate/main/20230719101806_create_ci_finished_builds_aggregated_queueing_delay_percentiles.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+class ScheduleIndexToCiJobArtifactStates < Gitlab::Database::Migration[2.2]
+  milestone '16.7'
+  disable_ddl_transaction!
+
+  INDEX_NAME = :index_ci_job_artifact_states_on_job_artifact_id_partition_id
+  TABLE_NAME = :ci_job_artifact_states
+  COLUMNS = [:job_artifact_id, :partition_id]
+
+  def up
+    prepare_async_index(TABLE_NAME, COLUMNS, name: INDEX_NAME)
+  end
+
+  def down
+    unprepare_async_index_by_name(TABLE_NAME, INDEX_NAME)
+  end
+end

db/click_house/migrate/20230724064832_create_contribution_analytics_events.rb renamed to db/click_house/migrate/main/20230724064832_create_contribution_analytics_events.rb

@@ -0,0 +1 @@
+d447c737dad0b4fc6f2b537e301983397f195a58bf56fd7002cdcb7bec86e589

db/click_house/migrate/20230724064918_create_contribution_analytics_events_materialized_view.rb renamed to db/click_house/migrate/main/20230724064918_create_contribution_analytics_events_materialized_view.rb

@@ -0,0 +1 @@
+13d80798b47df6524f7e5a7580215bf44d3654edb20b1c78c6acdb7e24e0ccd5

db/click_house/migrate/20230808070520_create_sync_cursors.rb renamed to db/click_house/migrate/main/20230808070520_create_sync_cursors.rb

@@ -4,16 +4,14 @@ group: Source Code
 info: Any user with at least the Maintainer role can merge updates to this content. For details, see https://docs.gitlab.com/ee/development/development_processes.html#development-guidelines-review.
 ---
 
-# Create: Source Code backend
+# Source Code Management
 
-The Create: Source Code backend (BE) team focuses on the GitLab suite of Source Code Management
-(SCM) tools. It is responsible for all backend aspects of the product categories
+The Source Code Management team is responsible for all backend aspects of the product categories
 that fall under the [Source Code group](https://about.gitlab.com/handbook/product/categories/#source-code-group)
 of the [Create stage](https://about.gitlab.com/handbook/product/categories/#create-stage)
 of the [DevOps lifecycle](https://about.gitlab.com/handbook/product/categories/#devops-stages).
 
-We interface with the Gitaly and Code Review teams, and work closely with the
-[Create: Source Code frontend team](https://about.gitlab.com/handbook/engineering/development/dev/create/create-source-code-fe/). The features
+We interface with the Gitaly and Code Review teams. The features
 we work with are listed on the
 [Features by Group Page](https://about.gitlab.com/handbook/product/categories/features/#createsource-code-group).
 
@@ -35,17 +33,28 @@ For more information, refer to the [GitLab Shell documentation](../../gitlab_she
 To learn about the reasoning behind our creation of `gitlab-sshd`, read the blog post
 [Why we implemented our own SSHD solution](https://about.gitlab.com/blog/2022/08/17/why-we-have-implemented-our-own-sshd-solution-on-gitlab-sass/).
 
+## CODEOWNERS
+
+Source Code Management shares ownership of [Code Owners](../../code_owners/index.md) with the Code Review group.
+
 ## GitLab Rails
 
 ### Gitaly touch points
 
-Gitaly is a Go RPC service which handles all the `git` calls made by GitLab.
-GitLab is not exposed directly, and all traffic comes through Create: Source Code.
-For more information, read [Gitaly touch points](gitaly_touch_points.md).
+[Gitaly](../../../administration/gitaly/index.md) provides high-level RPC access to Git repositories.
+It is present in every GitLab installation and coordinates Git repository storage and retrieval.
+Gitaly implements a client-server architecture with Gitaly as the server and Gitaly clients, also
+known as _Gitaly consumers_, including:
+
+- GitLab Rails
+- GitLab Shell
+- GitLab Workhorse
 
-### Source Code REST API Endpoints
+Gitaly Rails provides API endpoints that are counterparts of Gitaly RPCs. For more information, read [Gitaly touch points](gitaly_touch_points.md).
 
-Create: Source Code has over 100 REST endpoints, being a mixture of Grape API endpoints and Rails controller endpoints.
-For a detailed list, refer to [Source Code REST Endpoints](rest_endpoints.md).
+### Annotated Rails Source Code
 
-An alternative list of the [Source Code endpoints and other owned objects](https://gitlab-com.gitlab.io/gl-infra/platform/stage-groups-index/source-code.html) is available.
+The `:source_code_management` annotation indicates which code belongs to the Source Code Management
+group in the Rails codebase. The annotated objects are presented on
+[this page](https://gitlab-com.gitlab.io/gl-infra/platform/stage-groups-index/source-code.html) along
+with the [Error Budgets dashboards](https://dashboards.gitlab.net/d/stage-groups-source_code/stage-groups3a-source-code3a-group-dashboard?orgId=1).