Sean McGivern
3764fd4b41
Add blob_ace_mode to conflict content response
2016-10-13 14:16:35 -05:00
Sean McGivern
24424d932f
Fix merge conflict size limit
2016-09-07 16:00:26 +01:00
Sean McGivern
44eb3197a9
Handle non-UTF-8 conflicts gracefully
...
These can't be resolved in the UI because if they aren't in a UTF-8
compatible encoding, they can't be rendered as JSON. Even if they could,
we would be implicitly changing the file encoding anyway, which seems
like a bad idea.
2016-08-25 08:27:08 +01:00
Sean McGivern
4952a24f58
Find match line headers by backtracking
...
This is more efficient for large files than performing a regex match on
every single line.
2016-08-12 23:24:48 +03:00
Sean McGivern
ce7eb4e492
Add more tests for conflicts
2016-08-12 23:24:48 +03:00
Sean McGivern
ac9229a31b
Clarify Conflict::File#sections method
2016-08-12 23:24:48 +03:00
Sean McGivern
52eb523c9b
Add blob_icon to conflict file JSON
2016-08-12 23:24:47 +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
18398152fa
Raise errors for large and binary files
2016-08-12 23:24:44 +03:00
Sean McGivern
7af277f683
Auto-highlight conflict when rich_text is called
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
Sean McGivern
df2ed097b7
Add backend for merge conflicts reading
2016-08-12 23:24:43 +03:00
