diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2017-11-30 14:19:07 +0100 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2017-12-03 12:04:49 +0100 |
| commit | 8f01e67980d4ab8a7879800156cdc1dee07a4e8b (patch) | |
| tree | e2b15852db7663163e7f88d6aa6a44498379b167 /app/models/ci | |
| parent | 2045a771bfa5a1a32ff04f5bc23d58f1170b6359 (diff) | |
| download | gitlab-ce-8f01e67980d4ab8a7879800156cdc1dee07a4e8b.tar.gz | |
Revert "Rename `job_archive|metadata` to `artifacts_archive|metadata`"
This reverts commit 714082e65304ae2ec5c5400c59a68ab63e724aa9.
Diffstat (limited to 'app/models/ci')
| -rw-r--r-- | app/models/ci/build.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb index 842323e26e3..91747da28a1 100644 --- a/app/models/ci/build.rb +++ b/app/models/ci/build.rb @@ -16,8 +16,8 @@ module Ci has_many :trace_sections, class_name: 'Ci::BuildTraceSection' has_many :job_artifacts, class_name: 'Ci::JobArtifact', foreign_key: :job_id, dependent: :destroy # rubocop:disable Cop/ActiveRecordDependent - has_one :artifacts_archive, -> () { where(file_type: Ci::JobArtifact.file_types[:archive]) }, class_name: 'Ci::JobArtifact', foreign_key: :job_id - has_one :artifacts_metadata, -> () { where(file_type: Ci::JobArtifact.file_types[:metadata]) }, class_name: 'Ci::JobArtifact', foreign_key: :job_id + has_one :job_archive, -> () { where(file_type: Ci::JobArtifact.file_types[:archive]) }, class_name: 'Ci::JobArtifact', foreign_key: :job_id + has_one :job_metadata, -> () { where(file_type: Ci::JobArtifact.file_types[:metadata]) }, class_name: 'Ci::JobArtifact', foreign_key: :job_id # The "environment" field for builds is a String, and is the unexpanded name def persisted_environment |
