# Conflicts:
#	.gitlab-ci.yml
#	app/assets/javascripts/boards/boards_bundle.js
#	app/assets/javascripts/boards/filtered_search_boards.js
#	app/assets/javascripts/dispatcher.js
#	app/assets/javascripts/vue_merge_request_widget/dependencies.js
#	app/controllers/autocomplete_controller.rb
#	app/models/hooks/service_hook.rb
#	app/models/project.rb
#	app/models/project_services/kubernetes_service.rb
#	app/models/user.rb
#	app/services/ci/create_pipeline_service.rb
#	app/views/layouts/nav/_admin.html.haml
#	app/views/projects/hooks/edit.html.haml
#	app/views/shared/issuable/form/_merge_params.html.haml
#	config/initializers/1_settings.rb
#	config/routes/group.rb
#	db/schema.rb
#	doc/api/projects.md
#	spec/controllers/autocomplete_controller_spec.rb
#	spec/features/issues/form_spec.rb
#	spec/fixtures/api/schemas/entities/merge_request.json
#	spec/models/project_services/jira_service_spec.rb
#	spec/models/project_services/kubernetes_service_spec.rb
#	spec/models/project_spec.rb
#	spec/services/git_push_service_spec.rb
[ci skip]