Sean McGivern
ba327e69ec
Move resolving code to ResolveService
2016-08-12 23:24:48 +03:00
Sean McGivern
e50e88b85c
Add blob_path to conflict file JSON
2016-08-12 23:24:47 +03:00
Sean McGivern
3b84cfdc74
Use same resolution format on FE and BE
2016-08-12 23:24:46 +03:00
Sean McGivern
261d47bce9
Fix specs
...
- Add match line header to expected result for `File#sections`.
- Lowercase CSS colours.
- Remove unused `diff_refs` keyword argument.
- Rename `parent` -> `parent_file`, to be more explicit.
- Skip an iteration when highlighting.
2016-08-12 23:24:46 +03:00
Sean McGivern
f3cf40b8aa
Handle case where one side deleted the file
2016-08-12 23:24:46 +03:00
Sean McGivern
4d8b0293ae
Remove unneeded raise
2016-08-12 23:24:44 +03:00
Sean McGivern
97ceadeea7
Fix MR conflict resolution commits
2016-08-12 23:24:44 +03:00
Sean McGivern
28ef06c52b
Fix merge conflict reading for new diffs
2016-08-12 23:24:43 +03:00
Sean McGivern
14a4b17d1c
Allow resolving conflicts in MR controller
2016-08-12 23:24:43 +03:00
Sean McGivern
a1c7961217
Handle multiple merge conflict files in collection
2016-08-12 23:24:43 +03:00
