Commit f965bc9e authored by Rémy Coutable's avatar Rémy Coutable

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
parents b92b7d82 17924509
...@@ -87,7 +87,9 @@ module Ci ...@@ -87,7 +87,9 @@ module Ci
end end
def hashed_path? 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 end
def expire_in def expire_in
......
---
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
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