Sean McGivern 427e724698 Don't allow resolving invalid conflicts ... An MR can only be resolved in the UI if: - It has conflicts. - It has valid diff_refs (in other words, it supports new diff notes). - It has no conflicts with one side missing. - It has no conflicts in binary files. - It has no conflicts in files too large to display. - It has no conflicts containing invalid conflict markers.		2016-08-12 23:24:48 +03:00
..
file.rb	Don't allow resolving invalid conflicts	2016-08-12 23:24:48 +03:00
file_collection.rb	Add blob_path to conflict file JSON	2016-08-12 23:24:47 +03:00
parser.rb	Fix specs	2016-08-12 23:24:46 +03:00