# Conflicts:
#	app/assets/javascripts/diffs/store/actions.js
#	app/models/ci/pipeline.rb
#	app/serializers/issue_board_entity.rb
#	app/services/ci/create_pipeline_service.rb
#	app/views/admin/users/index.html.haml
#	doc/user/project/clusters/index.md
#	lib/gitlab/group_hierarchy.rb
#	lib/system_check/rake_task/app_task.rb
#	lib/system_check/rake_task/gitlab_task.rb
#	locale/gitlab.pot
#	spec/fixtures/api/schemas/entities/issue_boards.json
#	spec/models/project_spec.rb

[ci skip]