# Conflicts:
#	app/views/admin/application_settings/_ci_cd.html.haml
#	app/views/admin/application_settings/_form.html.haml
#	lib/gitlab/ci/config.rb
#	spec/spec_helper.rb

[ci skip]