summaryrefslogtreecommitdiff
path: root/app/uploaders
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-07-05 09:07:37 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-07-05 09:07:37 +0000
commitcf98b5d69a84324cad0f23b786a0ec0937c90944 (patch)
tree96a65fa7e9f4560ca87fd3db9e9072ae46e14639 /app/uploaders
parent5fd38b5f78df56538ff4362f7be734c65891f2d8 (diff)
downloadgitlab-ce-cf98b5d69a84324cad0f23b786a0ec0937c90944.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/uploaders')
-rw-r--r--app/uploaders/dependency_proxy/file_uploader.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/uploaders/dependency_proxy/file_uploader.rb b/app/uploaders/dependency_proxy/file_uploader.rb
index c46539bafaa..5154f180454 100644
--- a/app/uploaders/dependency_proxy/file_uploader.rb
+++ b/app/uploaders/dependency_proxy/file_uploader.rb
@@ -24,7 +24,7 @@ class DependencyProxy::FileUploader < GitlabUploader
# so we must store the custom content type in object storage.
# This does not apply to DependencyProxy::Blob uploads.
def set_content_type(file)
- return unless model.class == DependencyProxy::Manifest
+ return unless model.instance_of?(DependencyProxy::Manifest)
file.content_type = model.content_type
end