Use the Hashed Storage compatible layer to store Attachments

app/uploaders/file_uploader.rb

@@ -30,7 +30,7 @@ class FileUploader < GitlabUploader
   #
   # Returns a String without a trailing slash
   def self.dynamic_path_segment(model)
-    File.join(CarrierWave.root, base_dir, model.full_path)
+    File.join(CarrierWave.root, base_dir, model.disk_path)
   end
 
   attr_accessor :model

spec/uploaders/file_uploader_spec.rb

@@ -3,12 +3,38 @@ require 'spec_helper'
 describe FileUploader do
   let(:uploader) { described_class.new(build_stubbed(:project)) }
 
+  context 'legacy storage' do
+    let(:project) { build_stubbed(:project) }
+
+    describe '.absolute_path' do
+      it 'returns the correct absolute path by building it dynamically' do
+        upload = double(model: project, path: 'secret/foo.jpg')
+
+        dynamic_segment = project.full_path
+
+        expect(described_class.absolute_path(upload))
+          .to end_with("#{dynamic_segment}/secret/foo.jpg")
+      end
+    end
+
+    describe "#store_dir" do
+      it "stores in the namespace path" do
+        uploader = described_class.new(project)
+
+        expect(uploader.store_dir).to include(project.full_path)
+        expect(uploader.store_dir).not_to include("system")
+      end
+    end
+  end
+
+  context 'hashed storage' do
+    let(:project) { build_stubbed(:project, :hashed) }
+
     describe '.absolute_path' do
       it 'returns the correct absolute path by building it dynamically' do
-      project = build_stubbed(:project)
         upload = double(model: project, path: 'secret/foo.jpg')
 
-      dynamic_segment = project.path_with_namespace
+        dynamic_segment = project.disk_path
 
         expect(described_class.absolute_path(upload))
           .to end_with("#{dynamic_segment}/secret/foo.jpg")
@@ -17,13 +43,13 @@ describe FileUploader do
 
     describe "#store_dir" do
       it "stores in the namespace path" do
-      project = build_stubbed(:project)
         uploader = described_class.new(project)
 
-      expect(uploader.store_dir).to include(project.path_with_namespace)
+        expect(uploader.store_dir).to include(project.disk_path)
         expect(uploader.store_dir).not_to include("system")
       end
     end
+  end
 
   describe 'initialize' do
     it 'generates a secret if none is provided' do