diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-19 11:27:35 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-19 11:27:35 +0300 |
commit | 7e9c479f7de77702622631cff2628a9c8dcbc627 (patch) | |
tree | c8f718a08e110ad7e1894510980d2155a6549197 /app/uploaders | |
parent | e852b0ae16db4052c1c567d9efa4facc81146e88 (diff) |
Add latest changes from gitlab-org/gitlab@13-6-stable-eev13.6.0-rc42
Diffstat (limited to 'app/uploaders')
-rw-r--r-- | app/uploaders/dependency_proxy/file_uploader.rb | 23 | ||||
-rw-r--r-- | app/uploaders/gitlab_uploader.rb | 8 |
2 files changed, 31 insertions, 0 deletions
diff --git a/app/uploaders/dependency_proxy/file_uploader.rb b/app/uploaders/dependency_proxy/file_uploader.rb new file mode 100644 index 00000000000..b67a22bae4d --- /dev/null +++ b/app/uploaders/dependency_proxy/file_uploader.rb @@ -0,0 +1,23 @@ +# frozen_string_literal: true + +class DependencyProxy::FileUploader < GitlabUploader + include ObjectStorage::Concern + + storage_options Gitlab.config.dependency_proxy + + alias_method :upload, :model + + def filename + model.file_name + end + + def store_dir + dynamic_segment + end + + private + + def dynamic_segment + Gitlab::HashedPath.new('dependency_proxy', model.group_id, 'files', model.id, root_hash: model.group_id) + end +end diff --git a/app/uploaders/gitlab_uploader.rb b/app/uploaders/gitlab_uploader.rb index 411d8b2614f..9758d3c87aa 100644 --- a/app/uploaders/gitlab_uploader.rb +++ b/app/uploaders/gitlab_uploader.rb @@ -118,6 +118,14 @@ class GitlabUploader < CarrierWave::Uploader::Base storage.store!(file) end + def url_or_file_path(url_options = {}) + if file_storage? + 'file://' + path + else + url(url_options) + end + end + private # Designed to be overridden by child uploaders that have a dynamic path |