diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-03 12:07:54 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-03 12:07:54 +0300 |
| commit | 87ef501eacd66d7166183d20d84e33de022f7002 (patch) | |
| tree | fa4e0f41e00a4b6aeb035530be4b5473f51b7a3d /app/models/ci | |
| parent | f321e51f46bcb628c3e96a44b5ebf3bb1c4033ab (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/ci')
| -rw-r--r-- | app/models/ci/job_artifact.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/ci/job_artifact.rb b/app/models/ci/job_artifact.rb index 8defe742ec4..f9a5f713814 100644 --- a/app/models/ci/job_artifact.rb +++ b/app/models/ci/job_artifact.rb @@ -148,7 +148,7 @@ module Ci 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') + errors.add(:base, _('Invalid file format with specified file type')) end end |