# Conflicts:
#	app/assets/javascripts/environments/components/environment_item.vue
#	spec/fixtures/api/schemas/entities/merge_request_widget.json

[ci skip]