gitlab-org--gitlab-foss/doc
Robert Speicher 75ed0e27d9 Merge branch '21247-mergerequestscontroller-conflicts-may-fail-with-iso-8859-data' into 'master'
Handle non-UTF-8 conflicts gracefully

## What does this MR do?

If a conflict file isn't in a UTF-8-compatible encoding, we can't resolve it in the UI.

## What are the relevant issue numbers?

Closes #21247. 

See merge request !5961
2016-08-25 19:08:38 +00:00
..
administration
api
ci
container_registry
customization
development
downgrade_ee_to_ce
gitlab-basics
hooks
incoming_email
install
integration
intro
legal
logs
markdown
migrate_ci_to_ce
monitoring
operations
permissions
profile
project_services
public_access
raketasks
security
ssh
system_hooks
update Fix for update 8.10-to-8.11.md doc. 2016-08-22 18:05:13 +00:00
user Merge branch '21247-mergerequestscontroller-conflicts-may-fail-with-iso-8859-data' into 'master' 2016-08-25 19:08:38 +00:00
web_hooks
workflow Merge branch 'zj-remove-gitorious' into 'master' 2016-08-25 18:02:39 +00:00
README.md

README.md

Documentation

User documentation

Administrator documentation

Contributor documentation

  • Development All styleguides and explanations how to contribute.
  • Legal Contributor license agreements.