Commit 2a620e74 authored by Zeger-Jan van de Weg's avatar Zeger-Jan van de Weg Committed by Kamil Trzcinski

Remove hook set by carrierwave too

parent f5d3b921
...@@ -6,7 +6,6 @@ module Ci ...@@ -6,7 +6,6 @@ module Ci
belongs_to :job, class_name: "Ci::Build", foreign_key: :job_id belongs_to :job, class_name: "Ci::Build", foreign_key: :job_id
before_save :set_size, if: :file_changed? before_save :set_size, if: :file_changed?
after_commit :remove_file!, on: :destroy
mount_uploader :file, JobArtifactUploader mount_uploader :file, JobArtifactUploader
......
...@@ -1018,9 +1018,9 @@ describe Ci::Build do ...@@ -1018,9 +1018,9 @@ describe Ci::Build do
describe '#merge_request' do describe '#merge_request' do
def create_mr(build, pipeline, factory: :merge_request, created_at: Time.now) def create_mr(build, pipeline, factory: :merge_request, created_at: Time.now)
create(factory, source_project: pipeline.project, create(factory, source_project: pipeline.project,
target_project: pipeline.project, target_project: pipeline.project,
source_branch: build.ref, source_branch: build.ref,
created_at: created_at) created_at: created_at)
end end
context 'when a MR has a reference to the pipeline' do context 'when a MR has a reference to the pipeline' do
...@@ -1319,7 +1319,7 @@ describe Ci::Build do ...@@ -1319,7 +1319,7 @@ describe Ci::Build do
context 'when `when` is undefined' do context 'when `when` is undefined' do
before do before do
build.when = nil build.when = nil
end end
context 'use from gitlab-ci.yml' do context 'use from gitlab-ci.yml' do
let(:pipeline) { create(:ci_pipeline) } let(:pipeline) { create(:ci_pipeline) }
...@@ -1360,7 +1360,7 @@ describe Ci::Build do ...@@ -1360,7 +1360,7 @@ describe Ci::Build do
end end
end end
end end
end end
describe '#variables' do describe '#variables' do
let(:container_registry_enabled) { false } let(:container_registry_enabled) { false }
...@@ -1463,7 +1463,7 @@ describe Ci::Build do ...@@ -1463,7 +1463,7 @@ describe Ci::Build do
before do before do
environment_variables << environment_variables <<
{ key: 'CI_ENVIRONMENT_URL', value: url, public: true } { key: 'CI_ENVIRONMENT_URL', value: url, public: true }
end end
context 'when the URL was set from the job' do context 'when the URL was set from the job' do
......
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