diff options
| author | Rémy Coutable <remy@gitlab.com> | 2017-03-28 20:27:44 +0300 |
|---|---|---|
| committer | DJ Mountney <david@twkie.net> | 2017-03-29 20:14:38 +0300 |
| commit | b3ec0091c33aa0b9a3466f9651693240c857dee6 (patch) | |
| tree | 3dfec788716eb2c966e350c27152eda8288a308f /lib | |
| parent | 0fa55cc3027beea8c670bfa44c82cbb1ef9d52fc (diff) | |
Merge branch '29843-project-subgroup-transfer' into 'security'
Use full path for moving directories when changing namespace path
See merge request !2078
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 81701831a6a..7d0c47c5361 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(Rails.root, "public", "uploads") + File.join(CarrierWave.root, GitlabUploader.base_dir) end end end |