# Conflicts:
#	app/models/project.rb
#	app/presenters/ci/pipeline_presenter.rb
#	app/views/projects/pipelines/_with_tabs.html.haml

[ci skip]