# Conflicts:
#	app/models/ci/pipeline.rb
#	app/views/search/results/_blob_data.html.haml
#	lib/gitlab/slash_commands/command.rb
#	spec/lib/gitlab/ci/pipeline/chain/populate_spec.rb

[ci skip]