Merge branch 'rails5-explicit-hashed-path-check' into 'master'

Explicit hashed path check for trace, prevents background migration from…

See merge request gitlab-org/gitlab-ce!21533

app/models/ci/job_artifact.rb

@@ -87,7 +87,9 @@ module Ci
     end
 
     def hashed_path?
-      super || self.try(:file_location).nil?
+      return true if trace? # ArchiveLegacyTraces background migration might not have `file_location` column
+
+      super || self.file_location.nil?
     end
 
     def expire_in

changelogs/unreleased/rails5-explicit-hashed-path-check.yml

+---
+title: Explicit hashed path check for trace, prevents background migration from accessing
+  file_location column that doesn't exist
+merge_request: 21533
+author: Jasper Maes
+type: other