diff options
-rw-r--r-- | app/controllers/projects/jobs_controller.rb | 2 | ||||
-rw-r--r-- | app/controllers/projects/lfs_storage_controller.rb | 5 | ||||
-rw-r--r-- | app/models/lfs_object.rb | 8 | ||||
-rw-r--r-- | app/uploaders/attachment_uploader.rb | 1 | ||||
-rw-r--r-- | spec/uploaders/file_uploader_spec.rb | 26 | ||||
-rw-r--r-- | spec/workers/object_storage_upload_worker_spec.rb | 2 |
6 files changed, 5 insertions, 39 deletions
diff --git a/app/controllers/projects/jobs_controller.rb b/app/controllers/projects/jobs_controller.rb index abf4be6250b..85e972d9731 100644 --- a/app/controllers/projects/jobs_controller.rb +++ b/app/controllers/projects/jobs_controller.rb @@ -1,4 +1,6 @@ class Projects::JobsController < Projects::ApplicationController + include SendFileUpload + before_action :build, except: [:index, :cancel_all] before_action :authorize_read_build!, diff --git a/app/controllers/projects/lfs_storage_controller.rb b/app/controllers/projects/lfs_storage_controller.rb index 88fc373945a..6b16f1ccbbb 100644 --- a/app/controllers/projects/lfs_storage_controller.rb +++ b/app/controllers/projects/lfs_storage_controller.rb @@ -71,10 +71,7 @@ class Projects::LfsStorageController < Projects::GitHttpClientController end def move_tmp_file_to_storage(object, path) - File.open(path) do |f| - object.file = f - end - + object.file = File.open(path) object.file.store! object.save end diff --git a/app/models/lfs_object.rb b/app/models/lfs_object.rb index 54840fb084d..6c78c086662 100644 --- a/app/models/lfs_object.rb +++ b/app/models/lfs_object.rb @@ -9,16 +9,8 @@ class LfsObject < ActiveRecord::Base validates :oid, presence: true, uniqueness: true - scope :with_files_stored_locally, -> { where(file_store: [nil, LfsObjectUploader::Store::LOCAL]) } - mount_uploader :file, LfsObjectUploader - after_save if: :file_changed?, on: [:create, :update] do - run_after_commit do - file.schedule_background_upload - end - end - def project_allowed_access?(project) projects.exists?(project.lfs_storage_project.id) end diff --git a/app/uploaders/attachment_uploader.rb b/app/uploaders/attachment_uploader.rb index 11e038f9327..cd819dc9bff 100644 --- a/app/uploaders/attachment_uploader.rb +++ b/app/uploaders/attachment_uploader.rb @@ -2,6 +2,7 @@ class AttachmentUploader < GitlabUploader include RecordsUploads::Concern include ObjectStorage::Concern prepend ObjectStorage::Extension::RecordsUploads + include UploaderHelper private diff --git a/spec/uploaders/file_uploader_spec.rb b/spec/uploaders/file_uploader_spec.rb index 1f268fb7cb1..4b7dcbeda33 100644 --- a/spec/uploaders/file_uploader_spec.rb +++ b/spec/uploaders/file_uploader_spec.rb @@ -89,29 +89,6 @@ describe FileUploader do end end - describe 'callbacks' do - describe '#prune_store_dir after :remove' do - before do - uploader.store!(fixture_file_upload('spec/fixtures/doc_sample.txt')) - end - - def store_dir - File.expand_path(uploader.store_dir, uploader.root) - end - - it 'is called' do - expect(uploader).to receive(:prune_store_dir).once - - uploader.remove! - end - - it 'prune the store directory' do - expect { uploader.remove! } - .to change { File.exist?(store_dir) }.from(true).to(false) - end - end - end - describe "#migrate!" do before do uploader.store!(fixture_file_upload(Rails.root.join('spec/fixtures/dk.png'))) @@ -137,8 +114,5 @@ describe FileUploader do uploader.upload = upload end - - it_behaves_like "migrates", to_store: described_class::Store::REMOTE - it_behaves_like "migrates", from_store: described_class::Store::REMOTE, to_store: described_class::Store::LOCAL end end diff --git a/spec/workers/object_storage_upload_worker_spec.rb b/spec/workers/object_storage_upload_worker_spec.rb index 5edc4bc499b..32ddcbe9757 100644 --- a/spec/workers/object_storage_upload_worker_spec.rb +++ b/spec/workers/object_storage_upload_worker_spec.rb @@ -20,7 +20,7 @@ describe ObjectStorageUploadWorker do stub_lfs_object_storage(background_upload: true) end - it 'uploads object to storage' d + it 'uploads object to storage' do expect { perform }.to change { lfs_object.reload.file_store }.from(local).to(remote) end |