# Conflicts:
#	CHANGELOG.md
#	Gemfile.lock
#	Gemfile.rails5.lock
#	app/assets/javascripts/jobs/components/job_app.vue
#	app/assets/javascripts/jobs/store/getters.js
#	app/assets/javascripts/pipelines/components/graph/stage_column_component.vue
#	locale/gitlab.pot
#	qa/qa/page/project/menu.rb
#	spec/javascripts/pipelines/graph/stage_column_component_spec.js

[ci skip]