Remove code that removes duplicate CI variables

At this point this is being handled by GitLab Runner and we need to
introduce this as a separate merge request.
This commit is contained in:
Grzegorz Bizon 2016-04-16 20:21:01 +02:00
parent 9a74b92d2a
commit a6260b1eb7
2 changed files with 1 additions and 15 deletions

View File

@ -147,8 +147,7 @@ module Ci
end
def variables
(predefined_variables + yaml_variables + project_variables + trigger_variables)
.reverse.uniq { |var| var[:key] }.reverse
predefined_variables + yaml_variables + project_variables + trigger_variables
end
def merge_request

View File

@ -253,19 +253,6 @@ describe Ci::Build, models: true do
)
end
end
context 'when job variable has same key other variable has' do
let(:build) { create(:ci_build, name: 'production') }
it 'contains job yaml variable' do
expect(subject).to include(key: :DB_NAME, value: 'mysql',
public: true)
end
it 'contains only one variable with this key' do
expect(subject.count { |var| var[:key] == :DB_NAME } ).to eq 1
end
end
end
end
end