diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-08-14 07:39:52 +0000 |
|---|---|---|
| committer | Jose Ivan Vargas <jvargas@gitlab.com> | 2017-08-15 10:35:33 -0500 |
| commit | 3d02f8458d59ef19e326d43f1aa7094748a35e85 (patch) | |
| tree | 084224d9a67029f835706862aa4235248cbb7b1f /app | |
| parent | a6c9d7b390c3ff9b23eca673fff7d90a208b2fed (diff) | |
| download | gitlab-ce-3d02f8458d59ef19e326d43f1aa7094748a35e85.tar.gz | |
Merge branch 'bvl-rollback-renamed-system-namespace' into 'master'
Don't rename system when migrating from 9.x -> 9.4
Closes #35525 and #36148
See merge request !13228
Diffstat (limited to 'app')
| -rw-r--r-- | app/uploaders/personal_file_uploader.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/uploaders/personal_file_uploader.rb b/app/uploaders/personal_file_uploader.rb index ef70871624b..3298ad104ec 100644 --- a/app/uploaders/personal_file_uploader.rb +++ b/app/uploaders/personal_file_uploader.rb @@ -4,7 +4,7 @@ class PersonalFileUploader < FileUploader end def self.base_dir - File.join(root_dir, 'system') + File.join(root_dir, '-', 'system') end private |