# Conflicts:
#	app/controllers/dashboard_controller.rb
#	app/services/projects/update_pages_service.rb
#	doc/administration/index.md
#	doc/ci/variables/README.md
#	doc/ci/yaml/README.md
#	spec/models/environment_spec.rb

[ci skip]