diff options
author | Sean McGivern <sean@gitlab.com> | 2017-06-01 12:32:01 +0000 |
---|---|---|
committer | Regis <boudinot.regis@yahoo.com> | 2017-06-02 16:47:30 -0600 |
commit | cfbacecef26e320db4b1cff5d07708d7525d0ad4 (patch) | |
tree | 992752505ba82c3e0d00fe3ff9c6db1b07765a28 | |
parent | b213d8dfae02bd9562aafa73423db763e9c5a654 (diff) | |
download | gitlab-ce-cfbacecef26e320db4b1cff5d07708d7525d0ad4.tar.gz |
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
-rw-r--r-- | lib/gitlab/uploads_transfer.rb | 2 | ||||
-rw-r--r-- | spec/lib/gitlab/uploads_transfer_spec.rb | 11 | ||||
-rw-r--r-- | spec/models/namespace_spec.rb | 2 |
3 files changed, 13 insertions, 2 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 diff --git a/spec/lib/gitlab/uploads_transfer_spec.rb b/spec/lib/gitlab/uploads_transfer_spec.rb new file mode 100644 index 00000000000..109559bb01c --- /dev/null +++ b/spec/lib/gitlab/uploads_transfer_spec.rb @@ -0,0 +1,11 @@ +require 'spec_helper' + +describe Gitlab::UploadsTransfer do + it 'leaves avatar uploads where they are' do + project_with_avatar = create(:empty_project, :with_avatar) + + described_class.new.rename_namespace('project', 'project-renamed') + + expect(File.exist?(project_with_avatar.avatar.path)).to be_truthy + end +end diff --git a/spec/models/namespace_spec.rb b/spec/models/namespace_spec.rb index 49fa68a15a0..48cdfca05e1 100644 --- a/spec/models/namespace_spec.rb +++ b/spec/models/namespace_spec.rb @@ -176,7 +176,7 @@ describe Namespace, models: true do let(:parent) { create(:group, name: 'parent', path: 'parent') } let(:child) { create(:group, name: 'child', path: 'child', parent: parent) } let!(:project) { create(:project_empty_repo, path: 'the-project', namespace: child) } - let(:uploads_dir) { File.join(CarrierWave.root, 'uploads', 'system') } + let(:uploads_dir) { File.join(CarrierWave.root, FileUploader.base_dir) } let(:pages_dir) { File.join(TestEnv.pages_path) } before do |