Fix commit skipping
This commit is contained in:
parent
789fe7b489
commit
2e9c1608e5
|
@ -17,11 +17,11 @@ module Ci
|
|||
|
||||
tag = origin_ref.start_with?('refs/tags/')
|
||||
commit = project.gl_project.ensure_ci_commit(sha)
|
||||
return false if commit.skip_ci?
|
||||
|
||||
commit.update_committed!
|
||||
commit.create_builds(ref, tag, user)
|
||||
|
||||
unless commit.skip_ci?
|
||||
commit.update_committed!
|
||||
commit.create_builds(ref, tag, user)
|
||||
end
|
||||
|
||||
commit
|
||||
end
|
||||
end
|
||||
|
|
|
@ -35,7 +35,7 @@ describe Ci::MailService do
|
|||
let(:project) { FactoryGirl.create(:ci_project, email_add_pusher: true) }
|
||||
let(:gl_project) { FactoryGirl.create(:empty_project, gitlab_ci_project: project) }
|
||||
let(:commit) { FactoryGirl.create(:ci_commit, gl_project: gl_project) }
|
||||
let(:build) { FactoryGirl.create(:ci_build, status: :failed, commit: commit, user: user) }
|
||||
let(:build) { FactoryGirl.create(:ci_build, status: 'failed', commit: commit, user: user) }
|
||||
|
||||
before do
|
||||
allow(mail).to receive_messages(
|
||||
|
@ -167,7 +167,7 @@ describe Ci::MailService do
|
|||
end
|
||||
let(:gl_project) { FactoryGirl.create(:empty_project, gitlab_ci_project: project) }
|
||||
let(:commit) { FactoryGirl.create(:ci_commit, gl_project: gl_project) }
|
||||
let(:build) { FactoryGirl.create(:ci_build, status: :failed, commit: commit, user: user) }
|
||||
let(:build) { FactoryGirl.create(:ci_build, status: 'failed', commit: commit, user: user) }
|
||||
|
||||
before do
|
||||
allow(mail).to receive_messages(
|
||||
|
|
Loading…
Reference in New Issue