Commit c6d315b4 authored by Rémy Coutable's avatar Rémy Coutable
Browse files

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
parents 22265e20 0f2dcffb
......@@ -87,7 +87,7 @@ def local_store?
end
def hashed_path?
super || self.file_location.nil?
super || self.try(:file_location).nil?
end
def expire_in
......
---
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
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment