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

app/models/ci/job_artifact.rb

@@ -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

changelogs/unreleased/rails5-fix-job-artifact-hashed-path.yml

+---
+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