Commit c422ccb1 authored by Ian Baum's avatar Ian Baum

Resolve conflict with app/models/ci/job_artificat.rb

parent 0c1b7ea6
......@@ -11,15 +11,6 @@ module Ci
mount_uploader :file, JobArtifactUploader
<<<<<<< HEAD
after_save if: :file_changed?, on: [:create, :update] do
run_after_commit do
file.schedule_migration_to_object_storage
end
end
=======
>>>>>>> upstream/master
delegate :open, :exists?, to: :file
enum file_type: {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment