# Conflicts:
#	app/assets/javascripts/boards/boards_bundle.js
#	app/finders/issuable_finder.rb
#	app/services/ci/create_pipeline_service.rb
#	app/views/shared/boards/_show.html.haml
#	doc/user/project/integrations/kubernetes.md
[ci skip]