# Conflicts:
#	app/models/ci/pipeline.rb
#	app/services/ci/create_pipeline_service.rb
#	app/services/ci/pipeline_trigger_service.rb
#	app/views/admin/application_settings/_form.html.haml
#	spec/features/admin/admin_settings_spec.rb
#	spec/lib/gitlab/ci/pipeline/chain/populate_spec.rb
#	spec/models/ci/pipeline_spec.rb

[ci skip]