Conflicts:
	spec/lib/gitlab/git_access_spec.rb
	spec/lib/gitlab/git_access_wiki_spec.rb
	spec/services/auth/container_registry_authentication_service_spec.rb