Sean McGivern 30bca22d08 Fix 500 error when MR from fork has conflicts but worker has not run ... If the ref hasn't been fetched into the target repository yet, this will fail with a Rugged::ReferencError (assuming we're not using Gitaly). We should handle this in the same way as a missing ref.		2018-04-06 12:16:51 +01:00
..
file.rb	Fix 500 error when trying to resolve non-ASCII conflicts in editor	2018-03-23 18:33:14 +00:00
parser.rb	Fix 500 error when trying to resolve non-ASCII conflicts in editor	2018-03-23 18:33:14 +00:00
resolution.rb	Simplify conflict resolution interface and code	2018-01-02 16:22:02 -03:00
resolver.rb	Fix 500 error when MR from fork has conflicts but worker has not run	2018-04-06 12:16:51 +01:00