Remove hook set by carrierwave too

2 files changed, 6 insertions, 7 deletions

diff --git a/app/models/ci/job_artifact.rb b/app/models/ci/job_artifact.rb
index cc28092978c..e02fa021409 100644
--- a/app/models/ci/job_artifact.rb
+++ b/app/models/ci/job_artifact.rb
@@ -6,7 +6,6 @@ module Ci
     belongs_to :job, class_name: "Ci::Build", foreign_key: :job_id
 
     before_save :set_size, if: :file_changed?
-    after_commit :remove_file!, on: :destroy
 
     mount_uploader :file, JobArtifactUploader
 
diff --git a/spec/models/ci/build_spec.rb b/spec/models/ci/build_spec.rb
index fefb54ad6f7..212ff36633b 100644
--- a/spec/models/ci/build_spec.rb
+++ b/spec/models/ci/build_spec.rb
@@ -1018,9 +1018,9 @@ describe Ci::Build do
   describe '#merge_request' do
     def create_mr(build, pipeline, factory: :merge_request, created_at: Time.now)
       create(factory, source_project: pipeline.project,
-             target_project: pipeline.project,
-             source_branch: build.ref,
-             created_at: created_at)
+                      target_project: pipeline.project,
+                      source_branch: build.ref,
+                      created_at: created_at)
     end
 
     context 'when a MR has a reference to the pipeline' do
@@ -1319,7 +1319,7 @@ describe Ci::Build do
     context 'when `when` is undefined' do
       before do
         build.when = nil
-        end
+      end
 
       context 'use from gitlab-ci.yml' do
         let(:pipeline) { create(:ci_pipeline) }
@@ -1360,7 +1360,7 @@ describe Ci::Build do
         end
       end
     end
-    end
+  end
 
   describe '#variables' do
     let(:container_registry_enabled) { false }
@@ -1463,7 +1463,7 @@ describe Ci::Build do
 
         before do
           environment_variables <<
-          { key: 'CI_ENVIRONMENT_URL', value: url, public: true }
+            { key: 'CI_ENVIRONMENT_URL', value: url, public: true }
         end
 
         context 'when the URL was set from the job' do