summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app/models/concerns/artifact_migratable.rb6
1 files changed, 4 insertions, 2 deletions
diff --git a/app/models/concerns/artifact_migratable.rb b/app/models/concerns/artifact_migratable.rb
index cbd63ba8876..fe60d1dc39b 100644
--- a/app/models/concerns/artifact_migratable.rb
+++ b/app/models/concerns/artifact_migratable.rb
@@ -5,7 +5,8 @@
# Meant to be prepended so the interface can stay the same
module ArtifactMigratable
def artifacts_file
- job_artifacts_archive&.file || legacy_artifacts_file
+ job_artifacts_archive&.file ||
+ (Feature.disabled?('ci_drop_support_legacy_artifacts') && legacy_artifacts_file)
end
def artifacts_metadata
@@ -21,7 +22,8 @@ module ArtifactMigratable
end
def artifacts_file_changed?
- job_artifacts_archive&.file_changed? || attribute_changed?(:artifacts_file)
+ job_artifacts_archive&.file_changed? ||
+ (Feature.disabled?('ci_drop_support_legacy_artifacts') && attribute_changed?(:artifacts_file))
end
def remove_artifacts_file!