diff options
| author | samdbeckham <sbeckham@gitlab.com> | 2018-07-25 15:47:30 +0100 |
|---|---|---|
| committer | samdbeckham <sbeckham@gitlab.com> | 2018-07-25 15:51:28 +0100 |
| commit | 44904f34593d62d3b68a57e54118b6c31b050a6f (patch) | |
| tree | ff85e1bcd14d34b3f25c0abe610a55eb4a0dd1fa | |
| parent | 735a49154075b4824421c4c1180ef6428b6fe64c (diff) | |
| download | gitlab-ce-artifact-format-v2-with-parser.tar.gz | |
Fixes a missed conflictartifact-format-v2-with-parser
| -rw-r--r-- | app/models/ci/job_artifact.rb | 30 |
1 files changed, 1 insertions, 29 deletions
diff --git a/app/models/ci/job_artifact.rb b/app/models/ci/job_artifact.rb index 3f520bdfeb7..6321a4ca0be 100644 --- a/app/models/ci/job_artifact.rb +++ b/app/models/ci/job_artifact.rb @@ -32,7 +32,6 @@ module Ci metadata: 2, trace: 3, junit: 4 -<<<<<<< HEAD } GENERAL_ARCHIVE_FILE_TYPE = 'archive'.freeze @@ -48,8 +47,6 @@ module Ci FILE_FORMAT_ADAPTERS = { gzip: Gitlab::Ci::Build::Artifacts::GzipFileAdapter -======= ->>>>>>> 8f3b9c0d313f9eeef1b6e6b5eccf622156e960bd } def valid_file_format? unless TYPE_AND_FORMAT_PAIRS[self.file_type&.to_sym] == self.file_format&.to_sym @@ -61,31 +58,6 @@ module Ci ActiveRecord::Migrator.current_version <= ::Gitlab::Ci::Trace::ARCHIVE_LEGACY_TRACES_MIGRATION_VERSION end - GENERAL_ARCHIVE_FILE_TYPE = 'archive'.freeze - TEST_REPORT_FILE_TYPES = %w[junit].freeze - DEFAULT_FILE_NAMES = { junit: 'junit.xml' }.freeze - TYPE_AND_FORMAT_PAIRS = { archive: :zip, metadata: :gzip, trace: :raw, junit: :gzip }.freeze - - enum file_format: { - raw: 1, - zip: 2, - gzip: 3 - } - - FILE_FORMAT_ADAPTERS = { - gzip: Gitlab::Ci::Build::Artifacts::GzipFileAdapter - } - - def valid_file_format? - unless TYPE_AND_FORMAT_PAIRS[self.file_type&.to_sym] == self.file_format&.to_sym - errors.add(:file_format, 'Invalid file format with specified file type') - end - end - - def ignore_schema - ActiveRecord::Migrator.current_version <= ::Gitlab::Ci::Trace::ARCHIVE_LEGACY_TRACES_MIGRATION_VERSION - end - def update_file_store # The file.object_store is set during `uploader.store!` # which happens after object is inserted/updated @@ -146,4 +118,4 @@ module Ci job.project.pending_delete? end end -end +end
\ No newline at end of file |