# Conflicts:
#	app/assets/javascripts/boards/boards_bundle.js
#	app/assets/javascripts/boards/services/board_service.js
#	app/assets/javascripts/ide/components/repo_file.vue
#	app/assets/javascripts/ide/components/repo_tab.vue
#	app/models/project.rb
#	app/models/service.rb
#	app/serializers/merge_request_widget_entity.rb
#	lib/gitlab/git/repository.rb
#	spec/controllers/projects/artifacts_controller_spec.rb
#	spec/lib/gitlab/bare_repository_import/importer_spec.rb
#	spec/lib/gitlab/git/repository_spec.rb
#	spec/models/namespace_spec.rb
#	spec/models/project_spec.rb
#	spec/models/service_spec.rb

[ci skip]