# Conflicts:
#	app/assets/javascripts/jobs/components/job_app.vue
#	app/assets/javascripts/jobs/job_details_bundle.js
#	app/assets/javascripts/jobs/store/getters.js
#	app/views/projects/_import_project_pane.html.haml
#	app/views/projects/_new_project_fields.html.haml
#	app/views/projects/jobs/show.html.haml
#	app/views/projects/project_templates/_built_in_templates.html.haml
#	app/views/shared/_visibility_radios.html.haml
#	config/routes/project.rb
#	config/routes/user.rb
#	lib/api/commits.rb
#	locale/gitlab.pot
#	spec/javascripts/jobs/components/job_app_spec.js

[ci skip]