diff options
| author | DJ Mountney <david@twkie.net> | 2017-06-08 06:32:38 +0300 |
|---|---|---|
| committer | DJ Mountney <david@twkie.net> | 2017-06-08 07:16:20 +0300 |
| commit | 1d1363e2bb8a0aee7e2849fd463ea415035710d9 (patch) | |
| tree | a134cee38c4b710209c326533c662d30ca25dbc8 /lib/gitlab/uploads_transfer.rb | |
| parent | abc61f260074663e5711d3814d9b7d301d07a259 (diff) | |
Bring in security changes from the 9.2.5 release
Ran:
- git format-patch v9.2.2..v9.2.5 --stdout > patchfile.patch
- git checkout -b 9-2-5-security-patch origin/v9.2.2
- git apply patchfile.patch
- git commit
- [Got the sha ref for the commit]
- git checkout -b upstream-9-2-security master
- git cherry-pick <SHA of the patchfile commit>
- [Resolved conflicts]
- git cherry-pick --continue
Diffstat (limited to 'lib/gitlab/uploads_transfer.rb')
| -rw-r--r-- | lib/gitlab/uploads_transfer.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/uploads_transfer.rb b/lib/gitlab/uploads_transfer.rb index 7d0c47c5361..b5f41240529 100644 --- a/lib/gitlab/uploads_transfer.rb +++ b/lib/gitlab/uploads_transfer.rb @@ -1,7 +1,7 @@ module Gitlab class UploadsTransfer < ProjectTransfer def root_dir - File.join(CarrierWave.root, GitlabUploader.base_dir) + File.join(CarrierWave.root, FileUploader.base_dir) end end end |