summaryrefslogtreecommitdiff
path: root/app/models/concerns
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2017-11-30 14:19:07 +0100
committerKamil Trzcinski <ayufan@ayufan.eu>2017-12-03 12:04:49 +0100
commit8f01e67980d4ab8a7879800156cdc1dee07a4e8b (patch)
treee2b15852db7663163e7f88d6aa6a44498379b167 /app/models/concerns
parent2045a771bfa5a1a32ff04f5bc23d58f1170b6359 (diff)
downloadgitlab-ce-8f01e67980d4ab8a7879800156cdc1dee07a4e8b.tar.gz
Revert "Rename `job_archive|metadata` to `artifacts_archive|metadata`"
This reverts commit 714082e65304ae2ec5c5400c59a68ab63e724aa9.
Diffstat (limited to 'app/models/concerns')
-rw-r--r--app/models/concerns/artifact_migratable.rb16
1 files changed, 8 insertions, 8 deletions
diff --git a/app/models/concerns/artifact_migratable.rb b/app/models/concerns/artifact_migratable.rb
index b99585a0b65..811a8252459 100644
--- a/app/models/concerns/artifact_migratable.rb
+++ b/app/models/concerns/artifact_migratable.rb
@@ -3,11 +3,11 @@
# Meant to be prepended so the interface can stay the same
module ArtifactMigratable
def artifacts_file
- artifacts_archive&.file || legacy_artifacts_file
+ job_archive&.file || legacy_artifacts_file
end
def artifacts_metadata
- artifacts_metadata&.file || legacy_artifacts_metadata
+ job_metadata&.file || legacy_artifacts_metadata
end
def artifacts?
@@ -19,20 +19,20 @@ module ArtifactMigratable
end
def artifacts_file_changed?
- artifacts_archive&.file_changed? || attribute_changed?(:artifacts_file)
+ job_archive&.file_changed? || attribute_changed?(:artifacts_file)
end
def remove_artifacts_file!
- if artifacts_archive
- artifacts_archive.destroy
+ if job_archive
+ job_archive.destroy
else
remove_legacy_artifacts_file!
end
end
def remove_artifacts_metadata!
- if artifacts_metadata
- artifacts_metadata.destroy
+ if job_metadata
+ job_metadata.destroy
else
remove_legacy_artifacts_metadata!
end
@@ -40,6 +40,6 @@ module ArtifactMigratable
def artifacts_size
read_attribute(:artifacts_size).to_i +
- artifacts_archive&.size.to_i + artifacts_metadata&.size.to_i
+ job_archive&.size.to_i + job_metadata&.size.to_i
end
end