# Conflicts:
#	app/models/ci/build.rb
#	app/models/members_preloader.rb
#	config/gitlab.yml.example
#	db/schema.rb
#	spec/models/ci/build_spec.rb

[ci skip]