Commit 7e2a039b authored by Rémy Coutable's avatar Rémy Coutable

Resolve conflict in app/models/ci/pipeline.rb

Signed-off-by: default avatarRémy Coutable <remy@rymai.me>
parent 0b77a17c
...@@ -466,13 +466,10 @@ module Ci ...@@ -466,13 +466,10 @@ module Ci
.fabricate! .fabricate!
end end
<<<<<<< HEAD
def codeclimate_artifact def codeclimate_artifact
artifacts.codequality.find(&:has_codeclimate_json?) artifacts.codequality.find(&:has_codeclimate_json?)
end end
=======
>>>>>>> ce-com/master
def latest_builds_with_artifacts def latest_builds_with_artifacts
@latest_builds_with_artifacts ||= builds.latest.with_artifacts @latest_builds_with_artifacts ||= builds.latest.with_artifacts
end end
......
...@@ -1463,7 +1463,6 @@ describe Ci::Pipeline, :mailer do ...@@ -1463,7 +1463,6 @@ describe Ci::Pipeline, :mailer do
expect(query_count).to eq(1) expect(query_count).to eq(1)
end end
end end
<<<<<<< HEAD
describe '#codeclimate_artifact' do describe '#codeclimate_artifact' do
context 'has codequality job' do context 'has codequality job' do
...@@ -1492,6 +1491,4 @@ describe Ci::Pipeline, :mailer do ...@@ -1492,6 +1491,4 @@ describe Ci::Pipeline, :mailer do
it { expect(pipeline.codeclimate_artifact).to be_nil } it { expect(pipeline.codeclimate_artifact).to be_nil }
end end
end end
=======
>>>>>>> ce-com/master
end end
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