app/views/admin/application_settings/_ci_cd.html.haml · af9025b620cc9b37feb9d98eefaacd7b3aff1f87 · nexedi / gitlab-ce

Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-03-28 · af9025b6

GitLab Bot authored Mar 28, 2018

# 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]

af9025b6

_ci_cd.html.haml 2.4 KB

Replace _ci_cd.html.haml