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 Split Koding admin/user docs 2016-08-22 17:09:15 +03:00
api Merge branch 'dz-merge-request-version' 2016-08-25 12:59:21 -05:00
ci Merge branch 'fix/improve-test-coverage-badge-pipelines' into 'master' 2016-08-19 15:22:54 +00:00
container_registry Simplify feature introduction note 2016-08-08 11:44:55 +03:00
customization optimize png images losslessly using zopflipng 2016-06-29 19:22:15 +08:00
development Fix markdown link in doc_styleguide.md 2016-08-25 15:36:56 +02:00
downgrade_ee_to_ce Update EE downgrade instructions to include JenkinsDeprecatedService 2016-06-24 12:11:46 -07:00
gitlab-basics Update start-using-git.md 2016-07-21 16:49:40 +00:00
hooks Change doc location of custom hooks 2016-07-05 15:04:44 +03:00
incoming_email
install Merge branch 'workhorse-0.7.11' into 'master' 2016-08-24 19:28:23 +00:00
integration Fix wrong Koding link 2016-08-25 17:56:03 +02:00
intro Move labels documentation to new location 2016-06-21 18:54:30 +02:00
legal remove undefined word Corporation from CCLA 2016-08-16 16:35:54 -07:00
logs Move logs/logs.md to administration/logs.md 2016-06-13 13:52:20 +02:00
markdown Move markdown doc to the right location 2016-08-03 08:54:17 +03:00
migrate_ci_to_ce errros -> errors 2016-05-29 22:34:58 -07:00
monitoring Tracking of custom events 2016-08-17 10:04:04 +02:00
operations succes -> success 2016-05-29 22:35:23 -07:00
permissions Move permissions/permissions.md to user/permissions.md 2016-07-12 17:49:03 +03:00
profile optimize png images losslessly using zopflipng 2016-06-29 19:22:15 +08:00
project_services Refactor Slack service documentation 2016-07-22 12:37:05 +03:00
public_access Change URLs to new permissions.md location 2016-07-12 18:03:29 +03:00
raketasks Mention that gitlab.rb must be kept, too 2016-08-04 15:41:37 +01:00
security optimize png images losslessly using zopflipng 2016-06-29 19:22:15 +08:00
ssh Add note on changing password of SSH key 2016-05-25 03:42:22 +00:00
system_hooks Using single builder for push and tag events 2016-04-19 11:00:30 +02:00
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 Added documentation for pipeline hooks 2016-08-12 17:52:02 +02:00
workflow Merge branch 'zj-remove-gitorious' into 'master' 2016-08-25 18:02:39 +00:00
README.md Fix wrong Koding link 2016-08-25 17:56:03 +02:00

Documentation

User documentation

Administrator documentation

Contributor documentation

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