# Conflicts:
#	app/assets/javascripts/boards/boards_bundle.js
#	app/assets/javascripts/boards/filtered_search_boards.js
#	app/assets/javascripts/dispatcher.js
#	app/assets/javascripts/environments/stores/environments_store.js
#	app/assets/javascripts/vue_merge_request_widget/dependencies.js
#	app/controllers/autocomplete_controller.rb
#	app/models/project.rb
#	app/models/user.rb
#	app/services/ci/create_pipeline_service.rb
#	app/services/git_push_service.rb
#	app/services/git_tag_push_service.rb
#	app/views/projects/jobs/_sidebar.html.haml
#	app/views/projects/jobs/show.html.haml
#	db/schema.rb
#	doc/api/projects.md
#	lib/gitlab/etag_caching/router.rb
#	lib/gitlab/utils.rb
#	spec/controllers/autocomplete_controller_spec.rb
#	spec/features/issues/form_spec.rb
#	spec/features/projects/jobs_spec.rb
#	spec/javascripts/environments/environments_store_spec.js
#	spec/lib/gitlab/utils_spec.rb
#	spec/services/git_push_service_spec.rb
#	spec/support/test_env.rb
[ci skip]