Commit e02d4830 authored by Thong Kuah's avatar Thong Kuah

Resolve conflict in spec/models/ci/build_spec.rb

parent 5dcb9014
...@@ -2358,13 +2358,8 @@ describe Ci::Build do ...@@ -2358,13 +2358,8 @@ describe Ci::Build do
allow_any_instance_of(Project) allow_any_instance_of(Project)
.to receive(:predefined_variables) { [project_pre_var] } .to receive(:predefined_variables) { [project_pre_var] }
<<<<<<< HEAD
allow_any_instance_of(EE::Project) allow_any_instance_of(EE::Project)
.to receive(:secret_variables_for)
=======
allow_any_instance_of(Project)
.to receive(:ci_variables_for) .to receive(:ci_variables_for)
>>>>>>> upstream/master
.with(ref: 'master', environment: nil) do .with(ref: 'master', environment: nil) do
[create(:ci_variable, key: 'secret', value: 'value')] [create(:ci_variable, key: 'secret', value: 'value')]
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