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
..
builds	Refactor build artifacts documentation	2016-08-04 13:06:26 +03:00
img	Use new image for Issue Board page	2016-08-25 10:21:51 +02:00
merge_requests	Handle non-UTF-8 conflicts gracefully	2016-08-25 08:27:08 +01:00
settings	Fix permissions check in controller, added relevant spec and updated docs	2016-08-11 16:59:37 +02:00
description_templates.md	Add new image to show the 'Reset template' button	2016-08-18 09:14:06 +03:00
highlighting.md	doc: note that .gitattributes uses default branch	2016-06-27 14:17:49 -07:00
issue_board.md	Update Issue board documentation	2016-08-25 09:39:59 -03:00
koding.md	Split Koding admin/user docs	2016-08-22 17:09:15 +03:00
labels.md	Merge branch 'labels-grammar' into 'master'	2016-08-19 05:54:41 +00:00
protected_branches.md	Conform to doc styleguide on new features	2016-08-22 15:22:05 +03:00
slash_commands.md	Fix docs not rendering the pipe symbol	2016-08-22 15:56:43 +03:00