summaryrefslogtreecommitdiff
path: root/app/uploaders
diff options
context:
space:
mode:
authorJan Provaznik <jprovaznik@gitlab.com>2018-06-13 10:44:14 +0200
committerJan Provaznik <jprovaznik@gitlab.com>2018-06-13 10:44:14 +0200
commit3961407248c55f0524c8acfa154ace4ed33e087a (patch)
tree794a79e038685b5f907cfca4e850fd6f340cc45d /app/uploaders
parentcdd7dfc448fcb6bbcdb62aaac65a3af797f0f69a (diff)
downloadgitlab-ce-3961407248c55f0524c8acfa154ace4ed33e087a.tar.gz
fixed condition check
Diffstat (limited to 'app/uploaders')
-rw-r--r--app/uploaders/object_storage.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/uploaders/object_storage.rb b/app/uploaders/object_storage.rb
index f5b466a1aba..41fd5d2ee78 100644
--- a/app/uploaders/object_storage.rb
+++ b/app/uploaders/object_storage.rb
@@ -66,7 +66,7 @@ module ObjectStorage
# For FileUploaders, model may have many uploaders. In that case
# we want to use exclusive key per upload, not per model to allow
# parallel migration
- key_object = upload ? upload : model
+ key_object = upload || model
"object_storage_migrate:#{key_object.class}:#{key_object.id}"
end