# Conflicts:
#	app/assets/javascripts/environments/components/environment_item.vue
#	app/serializers/environment_entity.rb
#	app/views/admin/application_settings/show.html.haml
#	db/schema.rb
#	doc/ci/examples/README.md
#	doc/topics/autodevops/index.md
#	doc/user/project/merge_requests/index.md
#	lib/gitlab/git_access.rb
#	locale/gitlab.pot
#	spec/lib/gitlab/git_access_spec.rb
#	spec/serializers/environment_entity_spec.rb

[ci skip]