kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'rails5-fix-job-artifact-hashed-path' into 'master' 

Rails 5: fix hashed_path? method that looks up file_location that doesn't exist…

See merge request gitlab-org/gitlab-ce!21510
This commit is contained in:
Rémy Coutable 2018-09-05 12:09:25 +00:00
parent 22265e205b 0f2dcffb1d
commit c6d315b4bb
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/ci/job_artifact.rb
View File

@ -87,7 +87,7 @@ module Ci
end
def hashed_path?
super || self.file_location.nil?
super || self.try(:file_location).nil?
end
def expire_in

6
changelogs/unreleased/rails5-fix-job-artifact-hashed-path.yml Normal file
View File

@ -0,0 +1,6 @@
---
title: 'Rails 5: fix hashed_path? method that looks up file_location that doesn''t
exist when running certain migration specs'
merge_request: 21510
author: Jasper Maes
type: other