summaryrefslogtreecommitdiff
path: root/app/models
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-09-02 15:11:35 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-09-02 15:11:35 +0000
commitbea3a92105825c1fcef145727ba87bee3e31daee (patch)
treedde3c9fa4425865a8d3b49f3aaf73c7d04e6c592 /app/models
parentbd1df17345c7fe8cbc19a9716b931acdbb7d0ce5 (diff)
downloadgitlab-ce-bea3a92105825c1fcef145727ba87bee3e31daee.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models')
-rw-r--r--app/models/ci/job_artifact.rb3
1 files changed, 3 insertions, 0 deletions
diff --git a/app/models/ci/job_artifact.rb b/app/models/ci/job_artifact.rb
index 1f0da4345f2..b22b2d3e264 100644
--- a/app/models/ci/job_artifact.rb
+++ b/app/models/ci/job_artifact.rb
@@ -10,6 +10,9 @@ module Ci
include Artifactable
include FileStoreMounter
include EachBatch
+ include IgnorableColumns
+
+ ignore_columns %i[id_convert_to_bigint job_id_convert_to_bigint], remove_with: '14.5', remove_after: '2021-11-22'
TEST_REPORT_FILE_TYPES = %w[junit].freeze
COVERAGE_REPORT_FILE_TYPES = %w[cobertura].freeze