# Conflicts:
#	.gitlab-ci.yml
#	app/views/projects/pipelines/_with_tabs.html.haml
#	spec/javascripts/pipelines/pipeline_details_mediator_spec.js

[ci skip]