From 902fc4ddee9adc47c084b012ee1caeaeaa138c9c Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 28 Nov 2023 21:14:07 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/models/ci/pipeline_message.rb | 4 ---- app/models/concerns/enums/package_metadata.rb | 2 +- app/models/member.rb | 1 - 3 files changed, 1 insertion(+), 6 deletions(-) (limited to 'app') diff --git a/app/models/ci/pipeline_message.rb b/app/models/ci/pipeline_message.rb index c997ec5cd62..5668da915e6 100644 --- a/app/models/ci/pipeline_message.rb +++ b/app/models/ci/pipeline_message.rb @@ -2,10 +2,6 @@ module Ci class PipelineMessage < Ci::ApplicationRecord - include IgnorableColumns - - ignore_column :pipeline_id_convert_to_bigint, remove_with: '16.5', remove_after: '2023-09-22' - MAX_CONTENT_LENGTH = 10_000 belongs_to :pipeline diff --git a/app/models/concerns/enums/package_metadata.rb b/app/models/concerns/enums/package_metadata.rb index 28738dcabe8..385807cd7ed 100644 --- a/app/models/concerns/enums/package_metadata.rb +++ b/app/models/concerns/enums/package_metadata.rb @@ -4,7 +4,7 @@ module Enums class PackageMetadata ADVISORY_SOURCES = { glad: 1, # gitlab advisory db - trivy: 2 + 'trivy-db': 2 }.with_indifferent_access.freeze DATA_TYPES = { diff --git a/app/models/member.rb b/app/models/member.rb index efac1f52a38..cdc8814aaf1 100644 --- a/app/models/member.rb +++ b/app/models/member.rb @@ -28,7 +28,6 @@ class Member < ApplicationRecord belongs_to :user belongs_to :source, polymorphic: true # rubocop:disable Cop/PolymorphicAssociations belongs_to :member_namespace, inverse_of: :namespace_members, foreign_key: 'member_namespace_id', class_name: 'Namespace' - belongs_to :member_role delegate :name, :username, :email, :last_activity_on, to: :user, prefix: true -- cgit v1.2.3