diff --git a/app/models/vulnerability.rb b/app/models/vulnerability.rb index 0e3fe2cc8ac664025faa83387cb6d1cae5fc2533..abdf585af8123a7ce4de54008ee8e810b134aa84 100644 --- a/app/models/vulnerability.rb +++ b/app/models/vulnerability.rb @@ -5,6 +5,8 @@ class Vulnerability < ApplicationRecord include EachBatch include IgnorableColumns + ignore_column :milestone_id, remove_with: '16.9', remove_after: '2023-01-13' + alias_attribute :vulnerability_id, :id scope :with_projects, -> { includes(:project) } diff --git a/ee/app/models/ee/vulnerability.rb b/ee/app/models/ee/vulnerability.rb index ea10458137c686f8c632268a260b4bef4e10fb0c..7ff27fb2e00733a3e552a98ad12e1f2972983a20 100644 --- a/ee/app/models/ee/vulnerability.rb +++ b/ee/app/models/ee/vulnerability.rb @@ -35,7 +35,6 @@ module Vulnerability redact_field :description belongs_to :project # keep this association named 'project' for correct work of markdown cache - belongs_to :milestone belongs_to :epic belongs_to :author, class_name: 'User' # keep this association named 'author' for correct work of markdown cache diff --git a/ee/spec/models/ee/vulnerability_spec.rb b/ee/spec/models/ee/vulnerability_spec.rb index 24bfe2779f31063691d9b36144117ec2a69fa1f2..8793f1394d5ccb26896f234acc10b2dd44f0e460 100644 --- a/ee/spec/models/ee/vulnerability_spec.rb +++ b/ee/spec/models/ee/vulnerability_spec.rb @@ -48,7 +48,6 @@ subject { build(:vulnerability) } it { is_expected.to belong_to(:project) } - it { is_expected.to belong_to(:milestone) } it { is_expected.to belong_to(:epic) } it { is_expected.to have_many(:findings).class_name('Vulnerabilities::Finding').inverse_of(:vulnerability) } it { is_expected.to have_many(:dismissed_findings).class_name('Vulnerabilities::Finding').inverse_of(:vulnerability) }