Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

.rubocop_todo/layout/line_end_string_concatenation_indentation.yml

@@ -348,7 +348,6 @@ Layout/LineEndStringConcatenationIndentation:
     - 'ee/spec/views/admin/application_settings/_ee_package_registry.html.haml_spec.rb'
     - 'ee/spec/views/gitlab_subscriptions/trials/duo_pro/_advantages_list.html.haml_spec.rb'
     - 'ee/spec/views/groups/billings/index.html.haml_spec.rb'
-    - 'ee/spec/views/subscriptions/groups/edit.html.haml_spec.rb'
     - 'ee/spec/workers/groups/enterprise_users/bulk_associate_by_domain_worker_spec.rb'
     - 'ee/spec/workers/vulnerabilities/mark_dropped_as_resolved_worker_spec.rb'
     - 'lib/api/ci/job_artifacts.rb'

.rubocop_todo/rails/strong_params.yml

@@ -320,5 +320,4 @@ Rails/StrongParams:
     - 'ee/app/controllers/security/application_controller.rb'
     - 'ee/app/controllers/security/projects_controller.rb'
     - 'ee/app/controllers/smartcard_controller.rb'
-    - 'ee/app/controllers/subscriptions/groups_controller.rb'
     - 'ee/app/controllers/users/base_identity_verification_controller.rb'

.rubocop_todo/rspec/receive_messages.yml

@@ -218,7 +218,6 @@ RSpec/ReceiveMessages:
     - 'ee/spec/views/shared/credentials_inventory/personal_access_tokens/_personal_access_token.html.haml_spec.rb'
     - 'ee/spec/views/shared/credentials_inventory/ssh_keys/_ssh_key.html.haml_spec.rb'
     - 'ee/spec/views/shared/milestones/_milestone.html.haml_spec.rb'
-    - 'ee/spec/views/subscriptions/groups/edit.html.haml_spec.rb'
     - 'ee/spec/views/trial_registrations/new.html.haml_spec.rb'
     - 'ee/spec/workers/active_user_count_threshold_worker_spec.rb'
     - 'ee/spec/workers/anti_abuse/new_abuse_report_worker_spec.rb'

.rubocop_todo/style/block_delimiters.yml

@@ -21,32 +21,17 @@ Style/BlockDelimiters:
     - 'ee/spec/models/ee/projects/wiki_repository_spec.rb'
     - 'ee/spec/models/geo/design_management_repository_state_spec.rb'
     - 'ee/spec/models/geo/wiki_repository_state_spec.rb'
-    - 'ee/spec/models/merge_request_spec.rb'
     - 'ee/spec/models/namespace_setting_spec.rb'
     - 'ee/spec/models/protected_environments/deploy_access_level_spec.rb'
-    - 'ee/spec/models/security/finding_spec.rb'
     - 'ee/spec/models/vulnerabilities/feedback_spec.rb'
     - 'ee/spec/services/gitlab_subscriptions/reconciliations/calculate_seat_count_data_service_spec.rb'
     - 'ee/spec/services/package_metadata/advisory_data_object_spec.rb'
     - 'ee/spec/services/package_metadata/compressed_package_data_object_spec.rb'
     - 'ee/spec/services/package_metadata/data_object_fabricator_spec.rb'
     - 'ee/spec/services/security/scanned_resources_counting_service_spec.rb'
     - 'ee/spec/services/security/scanned_resources_service_spec.rb'
-    - 'ee/spec/services/security/vulnerability_counting_service_spec.rb'
     - 'spec/helpers/abuse_reports_helper_spec.rb'
     - 'spec/helpers/admin/user_actions_helper_spec.rb'
-    - 'spec/helpers/merge_requests_helper_spec.rb'
-    - 'spec/helpers/projects/cluster_agents_helper_spec.rb'
-    - 'spec/lib/gitlab/ci/build/rules_spec.rb'
-    - 'spec/lib/gitlab/ci/config/external/file/artifact_spec.rb'
-    - 'spec/lib/gitlab/ci/config/external/file/base_spec.rb'
-    - 'spec/lib/gitlab/ci/config/external/file/local_spec.rb'
-    - 'spec/lib/gitlab/ci/config/external/file/project_spec.rb'
-    - 'spec/lib/gitlab/ci/config/external/file/remote_spec.rb'
-    - 'spec/lib/gitlab/ci/config/external/file/template_spec.rb'
-    - 'spec/lib/gitlab/data_builder/build_spec.rb'
-    - 'spec/lib/gitlab/git/wraps_gitaly_errors_spec.rb'
-    - 'spec/lib/release_highlights/validator/entry_spec.rb'
     - 'spec/models/abuse_report_spec.rb'
     - 'spec/models/ci/group_variable_spec.rb'
     - 'spec/models/container_registry/protection/rule_spec.rb'

GITALY_SERVER_VERSION

@@ -1 +1 @@
-275f2266ac911d785aaf7f5f79dd76240f372a7f
+9a94e7c7c19fce3afb5c36d045195c06e50ce3ca

GITLAB_KAS_VERSION

@@ -1 +1 @@
-f48b28ef570a270b659aee53320959cffb2cebdb
+2f84f1083ebc22f6efe3ab00355ef5170bcbc142

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

@@ -275,14 +275,15 @@ export default {
             <load-or-error-or-show :is-loading="isLoading" :error-message="errorMessage">
               <gl-tabs class="gl-mt-4" :value="tabIndex">
                 <gl-tab
-                  v-if="latestVersion"
                   :title="$options.i18n.tabModelCardTitle"
                   @click="goTo($options.ROUTE_DETAILS)"
                 />
-                <gl-tab v-if="latestVersion" @click="goTo($options.ROUTE_VERSIONS)">
+                <gl-tab @click="goTo($options.ROUTE_VERSIONS)">
                   <template #title>
                     {{ $options.i18n.tabVersionsTitle }}
-                    <gl-badge class="gl-tab-counter-badge">{{ versionCount }}</gl-badge>
+                    <gl-badge v-if="versionCount" class="gl-tab-counter-badge">{{
+                      versionCount
+                    }}</gl-badge>
                   </template>
                 </gl-tab>
 

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

@@ -1,15 +1,11 @@
 <script>
-import { GlLink } from '@gitlab/ui';
 import { s__ } from '~/locale';
 import IssuableDescription from '~/vue_shared/issuable/show/components/issuable_description.vue';
-import EmptyState from './model_list_empty_state.vue';
 
 export default {
   name: 'ModelDetail',
   components: {
     IssuableDescription,
-    EmptyState,
-    GlLink,
   },
   provide() {
     return {
@@ -55,27 +51,15 @@ export default {
     },
   },
   emptyState: {
-    title: s__('MlModelRegistry|Manage versions of your machine learning model'),
     modelCardDescription: s__(
       'MlModelRegistry|No description available. To add a description, click "Edit model" above.',
     ),
-    description: s__('MlModelRegistry|Use versions to track performance, parameters, and metadata'),
-    primaryText: s__('MlModelRegistry|Create new version'),
   },
 };
 </script>
 
 <template>
   <div class="issue-details issuable-details">
-    <div v-if="model.latestVersion">
-      <h3 class="gl-text-lg">
-        {{ s__('MlModelRegistry|Latest version') }}:
-
-        <gl-link :href="model.latestVersion._links.showPath" data-testid="model-version-link">
-          {{ model.latestVersion.version }}
-        </gl-link>
-      </h3>
-    </div>
     <div
       v-if="model.descriptionHtml"
       class="detail-page-description js-detail-page-description content-block gl-pt-4"
@@ -91,13 +75,5 @@ export default {
     <div v-else class="gl-text-secondary" data-testid="empty-description-state">
       {{ $options.emptyState.modelCardDescription }}
     </div>
-
-    <empty-state
-      v-if="!model.latestVersion"
-      :title="$options.emptyState.title"
-      :description="$options.emptyState.description"
-      :primary-text="$options.emptyState.primaryText"
-      :primary-link="createModelVersionPath"
-    />
   </div>
 </template>

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

@@ -18,7 +18,7 @@ export default {
     EmptyState,
     SearchableTable,
   },
-  inject: ['createModelVersionPath'],
+  inject: ['createModelVersionPath', 'latestVersion'],
   props: {
     modelId: {
       type: String,
@@ -60,6 +60,9 @@ export default {
     versions() {
       return this.modelVersions?.nodes ?? [];
     },
+    showSearch() {
+      return Boolean(this.latestVersion);
+    },
   },
   methods: {
     fetchPage(variables) {
@@ -101,7 +104,7 @@ export default {
 </script>
 <template>
   <searchable-table
-    show-search
+    :show-search="showSearch"
     :page-info="pageInfo"
     :model-versions="versions"
     :error-message="errorMessage"

app/assets/javascripts/todos/components/todo_item_title.vue

@@ -1,18 +1,23 @@
 <script>
+import { GlIcon } from '@gitlab/ui';
 import StatusBadge from '~/issuable/components/status_badge.vue';
 import { s__ } from '~/locale';
 import { STATUS_OPEN, TYPE_ALERT, TYPE_ISSUE, TYPE_MERGE_REQUEST } from '~/issues/constants';
 import {
   TODO_ACTION_TYPE_MEMBER_ACCESS_REQUESTED,
   TODO_TARGET_TYPE_ALERT,
   TODO_TARGET_TYPE_DESIGN,
+  TODO_TARGET_TYPE_EPIC,
   TODO_TARGET_TYPE_ISSUE,
   TODO_TARGET_TYPE_MERGE_REQUEST,
+  TODO_TARGET_TYPE_PIPELINE,
+  TODO_TARGET_TYPE_SSH_KEY,
 } from '../constants';
 
 export default {
   components: {
     StatusBadge,
+    GlIcon,
   },
   props: {
     todo: {
@@ -97,6 +102,26 @@ export default {
 
       return '';
     },
+    icon() {
+      switch (this.todo.targetType) {
+        case TODO_TARGET_TYPE_ISSUE:
+          return 'issues';
+        case TODO_TARGET_TYPE_MERGE_REQUEST:
+          return 'merge-request';
+        case TODO_TARGET_TYPE_PIPELINE:
+          return 'pipeline';
+        case TODO_TARGET_TYPE_ALERT:
+          return 'status-alert';
+        case TODO_TARGET_TYPE_DESIGN:
+          return 'issues';
+        case TODO_TARGET_TYPE_SSH_KEY:
+          return 'token';
+        case TODO_TARGET_TYPE_EPIC:
+          return 'epic';
+        default:
+          return null;
+      }
+    },
   },
   i18n: {
     removed: s__('Todos|(removed)'),
@@ -109,6 +134,7 @@ export default {
     class="gl-flex gl-items-center gl-gap-2 gl-overflow-hidden gl-whitespace-nowrap gl-px-2 gl-pb-3 gl-pt-2 gl-text-sm gl-text-subtle sm:gl-mr-0 sm:gl-pr-4 md:gl-mb-1"
   >
     <status-badge v-if="showStatusBadge" :issuable-type="issuableType" :state="issuableState" />
+    <gl-icon v-if="icon" :name="icon" />
     <div class="gl-overflow-hidden gl-text-ellipsis">
       <span v-if="targetTitle" class="todo-target-title">{{ targetTitle }}</span>
       <span v-if="!isDesign && !isMemberAccessRequestAction">&middot;</span>

app/assets/javascripts/todos/constants.js

@@ -10,6 +10,7 @@ export const TODO_TARGET_TYPE_DESIGN = 'DESIGN';
 export const TODO_TARGET_TYPE_ALERT = 'ALERT';
 export const TODO_TARGET_TYPE_EPIC = 'EPIC';
 export const TODO_TARGET_TYPE_SSH_KEY = 'KEY';
+export const TODO_TARGET_TYPE_PIPELINE = 'PIPELINE';
 
 export const TODO_ACTION_TYPE_ASSIGNED = 'assigned';
 export const TODO_ACTION_TYPE_MENTIONED = 'mentioned';

app/models/commit_collection.rb

@@ -175,14 +175,12 @@ def committers_emails(with_merge_commits: false, include_author_when_signed: fal
   end
 
   def committer_emails_for(commits, include_author_when_signed: false)
-    commit_author_change_enabled = ::Feature.enabled?(:web_ui_commit_author_change, project)
-
-    if include_author_when_signed && commit_author_change_enabled
+    if include_author_when_signed
       commits.each(&:signature) # preload signatures
     end
 
     commits.filter_map do |commit|
-      if include_author_when_signed && commit_author_change_enabled && commit.signature&.verified_system?
+      if include_author_when_signed && commit.signature&.verified_system?
         commit.author_email
       else
         commit.committer_email

app/services/commits/cherry_pick_service.rb

@@ -26,8 +26,6 @@ def create_commit!
     def commit_message
       message = commit.cherry_pick_message(current_user)
 
-      return message unless ::Feature.enabled?(:web_ui_commit_author_change, project)
-
       co_authored_trailer = "#{Commit::CO_AUTHORED_TRAILER}: #{commit.author_name} <#{commit.author_email}>"
 
       "#{message}\n\n#{co_authored_trailer}"
@@ -45,12 +43,7 @@ def track_mr_picking(pick_sha)
     end
 
     def perform_cherry_pick(message)
-      author_kwargs =
-        if Feature.enabled?(:web_ui_commit_author_change, project)
-          { author_name: current_user.name, author_email: current_user.email }
-        else
-          {}
-        end
+      author_kwargs = { author_name: current_user.name, author_email: current_user.email }
 
       repository.cherry_pick(current_user, @commit, @branch_name, message,
         start_project: @start_project, start_branch_name: @start_branch, dry_run: @dry_run,

app/services/suggestions/apply_service.rb

@@ -50,17 +50,10 @@ def multi_service
         branch_name: suggestion_set.branch,
         start_branch: suggestion_set.branch,
         actions: suggestion_set.actions,
-        author_name: author&.name,
-        author_email: author&.email
+        author_name: current_user.name,
+        author_email: current_user.commit_email_or_default
       }
 
-      if ::Feature.enabled?(:web_ui_commit_author_change, project)
-        params.merge!({
-          author_name: current_user.name,
-          author_email: current_user.commit_email_or_default
-        })
-      end
-
       ::Files::MultiService.new(suggestion_set.source_project, current_user, params)
     end
 

config/feature_flags/beta/web_ui_commit_author_change.yml

@@ -179,7 +179,6 @@
         draw :trial_registration
         draw :country
         draw :country_state
-        draw :subscription
         draw :gitlab_subscriptions
         draw :phone_verification
         draw :arkose

config/routes.rb

@@ -426,3 +426,76 @@ CREATE TABLE labels (
     CONSTRAINT check_45e873b2a8 CHECK ((num_nonnulls(group_id, project_id) > 0))
 );
 ```
+
+## Dropping a `NOT NULL` constraint on a column in an existing table
+
+### Dropping a `NOT NULL` constraint with a check constraint on the column
+
+First, please verify there's a constraint in place on the column. You can do this in several ways:
+
+- Query the [`Gitlab::Database::PostgresConstraint`](https://gitlab.com/gitlab-org/gitlab/-/blob/71892a3c97f52ddcef819dd210ab32864e90c85c/lib/gitlab/database/postgres_constraint.rb) view in rails console
+- Use `psql` to check the table itself: `\d+ table_name`
+- Check `structure.sql`:
+
+```sql
+CREATE TABLE labels (
+    ...
+   CONSTRAINT check_061f6f1c91 CHECK ((project_view IS NOT NULL))
+);
+```
+
+#### Example
+
+```ruby
+# frozen_string_literal: true
+class DropNotNullConstraintFromTableColumn< Gitlab::Database::Migration[2.2]
+  disable_ddl_transaction!
+  milestone '16.7'
+
+  def up
+    remove_not_null_constraint :table_name, :column_name
+  end
+
+  def down
+    add_not_null_constraint :table_name, :column_name
+  end
+end
+```
+
+<b>NOTE:</b> The milestone number is just an example. Please use the correct version.
+
+### Dropping a `NOT NULL` constraint without a check constraint on the column
+
+If `NOT NULL` is just defined on the column and without a check constraint then we can use `change_column_null`.
+
+Example in `structure.sql`:
+
+```sql
+CREATE TABLE labels (
+    ...
+   projects_limit integer NOT NULL
+);
+```
+
+#### Example
+
+```ruby
+# frozen_string_literal: true
+class DropNotNullConstraintFromTableColumn < Gitlab::Database::Migration[2.2]
+  milestone '16.7'
+
+  def up
+    change_column_null :table_name, :column_name, true
+  end
+
+  def down
+    change_column_null :table_name, :column_name, false
+  end
+end
+```
+
+<b>NOTE:</b> The milestone number is just an example. Please use the correct version.
+
+### Dropping a `NOT NULL` constraint on a partition table
+
+Important note: we cannot drop the `NOT NULL` constraint from an individual partition if it exists on the parent table because all the partitions inherit the constraint from the parent table. For this reason, we need to drop the constraint from the parent table instead which cascades to all the child partitions.

doc/development/database/not_null_constraints.md

@@ -29,8 +29,7 @@ GitLab Duo AI-powered features are powered by a generative AI model. The process
 
 The below reflects the current retention periods of GitLab AI model [Sub-Processors](https://about.gitlab.com/privacy/subprocessors/#third-party-sub-processors):
 
-- Anthropic discards model input and output data immediately after the output is provided. Anthropic currently does not store data for abuse monitoring. Model input and output is not used to train models. GitLab has arranged [zero data retention](https://support.anthropic.com/en/articles/8956058-i-have-a-zero-retention-agreement-with-anthropic-what-products-does-it-apply-to) with Anthropic for GitLab Duo requests.
-- [Google discards model input and output data](https://cloud.google.com/vertex-ai/generative-ai/docs/data-governance#prediction) immediately after the output is provided. Google currently does not store data for abuse monitoring. Model input and output is not used to train models. Additionally, GitLab [has disabled caching](https://cloud.google.com/vertex-ai/generative-ai/docs/multimodal/multimodal-faqs#caching) for GitLab Duo requests.
+GitLab has arranged zero-day data retention with Anthropic and Google for GitLab Duo requests. Anthropic and Google discard model input and output data immediately after the output is provided; input and output data is not stored for abuse monitoring. Model input and output is not used to train models.
 
 All of these AI providers are under data protection agreements with GitLab that prohibit the use of Customer Content for their own purposes, except to perform their independent legal obligations.