diff options
| author | Rémy Coutable <remy@gitlab.com> | 2017-03-28 17:27:44 +0000 |
|---|---|---|
| committer | DJ Mountney <david@twkie.net> | 2017-03-29 19:16:50 -0700 |
| commit | 60c0c0f3d08aa2c2a5be68aa784a86304fdb9c99 (patch) | |
| tree | 36fc5767de0d2d9bdd7a996677d3130a43f7ea95 /lib/gitlab/uploads_transfer.rb | |
| parent | 97a5e91bbe9449a448fae5373cbf91087578cbc6 (diff) | |
| download | gitlab-ce-60c0c0f3d08aa2c2a5be68aa784a86304fdb9c99.tar.gz | |
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/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 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 |