diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-17 19:05:49 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-17 19:05:49 +0300 |
| commit | 43a25d93ebdabea52f99b05e15b06250cd8f07d7 (patch) | |
| tree | dceebdc68925362117480a5d672bcff122fb625b /app/uploaders/ci | |
| parent | 20c84b99005abd1c82101dfeff264ac50d2df211 (diff) | |
Add latest changes from gitlab-org/gitlab@16-0-stable-eev16.0.0-rc42
Diffstat (limited to 'app/uploaders/ci')
| -rw-r--r-- | app/uploaders/ci/pipeline_artifact_uploader.rb | 2 | ||||
| -rw-r--r-- | app/uploaders/ci/secure_file_uploader.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/uploaders/ci/pipeline_artifact_uploader.rb b/app/uploaders/ci/pipeline_artifact_uploader.rb index d3a83c5d633..62e00fe1a66 100644 --- a/app/uploaders/ci/pipeline_artifact_uploader.rb +++ b/app/uploaders/ci/pipeline_artifact_uploader.rb @@ -4,7 +4,7 @@ module Ci class PipelineArtifactUploader < GitlabUploader include ObjectStorage::Concern - storage_options Gitlab.config.artifacts + storage_location :artifacts alias_method :upload, :model diff --git a/app/uploaders/ci/secure_file_uploader.rb b/app/uploaders/ci/secure_file_uploader.rb index 11cbfc6c1f2..09d9b3abafb 100644 --- a/app/uploaders/ci/secure_file_uploader.rb +++ b/app/uploaders/ci/secure_file_uploader.rb @@ -4,7 +4,7 @@ module Ci class SecureFileUploader < GitlabUploader include ObjectStorage::Concern - storage_options Gitlab.config.ci_secure_files + storage_location :ci_secure_files # Use Lockbox to encrypt/decrypt the stored file (registers CarrierWave callbacks) encrypt(key: :key) |