diff options
| author | Sean McGivern <sean@gitlab.com> | 2017-06-01 15:32:01 +0300 |
|---|---|---|
| committer | Regis <boudinot.regis@yahoo.com> | 2017-06-02 22:23:55 +0300 |
| commit | 883d27144d0a0a62c1e1a5f9f7f36f357632b17d (patch) | |
| tree | fbab9ce95bc9cd2f974a8b6ddd13281c8111ff8e /lib | |
| parent | e90079d59983330ea6ee377b6c55f2ff3c95bb50 (diff) | |
Merge branch 'bvl-move-project-uploads-correctly' into 'security-9-2'
Move the uploads in the correct folder when moving project/namespace
See merge request !2112
Diffstat (limited to 'lib')
| -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 |