| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Handle non-UTF-8 conflicts gracefully21247-mergerequestscontroller-conflicts-may-fail-with-iso-8859-data | Sean McGivern | 2016-08-25 | 1 | -0/+9 |
| | | | | | | | | 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. | ||||
| * | Fix bug where conflict view would have one too many context sections | Douwe Maan | 2016-08-12 | 1 | -2/+4 |
| | | |||||
| * | Find match line headers by backtracking | Sean McGivern | 2016-08-12 | 1 | -11/+24 |
| | | | | | | This is more efficient for large files than performing a regex match on every single line. | ||||
| * | Add more tests for conflicts | Sean McGivern | 2016-08-12 | 1 | -1/+1 |
| | | |||||
| * | Move resolving code to ResolveService | Sean McGivern | 2016-08-12 | 2 | -29/+0 |
| | | |||||
| * | Clarify Conflict::File#sections method | Sean McGivern | 2016-08-12 | 1 | -3/+19 |
| | | |||||
| * | Don't allow resolving invalid conflicts | Sean McGivern | 2016-08-12 | 1 | -2/+2 |
| | | | | | | | | | | | 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. | ||||
| * | Add blob_icon to conflict file JSON | Sean McGivern | 2016-08-12 | 1 | -2/+4 |
| | | |||||
| * | Add blob_path to conflict file JSON | Sean McGivern | 2016-08-12 | 2 | -4/+10 |
| | | |||||
| * | Use same resolution format on FE and BE | Sean McGivern | 2016-08-12 | 2 | -4/+5 |
| | | |||||
| * | Fix specs | Sean McGivern | 2016-08-12 | 3 | -15/+10 |
| | | | | | | | | | - 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. | ||||
| * | Fix match line headers at start / end of file | Sean McGivern | 2016-08-12 | 1 | -16/+33 |
| | | |||||
| * | Handle case where one side deleted the file | Sean McGivern | 2016-08-12 | 1 | -3/+5 |
| | | |||||
| * | Highlight files based on merged file | Sean McGivern | 2016-08-12 | 1 | -2/+5 |
| | | |||||
| * | Remove unneeded raise | Sean McGivern | 2016-08-12 | 1 | -3/+0 |
| | | |||||
| * | Add match line headers | Sean McGivern | 2016-08-12 | 1 | -1/+8 |
| | | |||||
| * | Raise errors for large and binary files | Sean McGivern | 2016-08-12 | 1 | -1/+5 |
| | | |||||
| * | Handle conflict resolution errors in controller | Sean McGivern | 2016-08-12 | 2 | -7/+10 |
| | | |||||
| * | Fix MR conflict resolution commits | Sean McGivern | 2016-08-12 | 1 | -1/+1 |
| | | |||||
| * | Auto-highlight conflict when rich_text is called | Sean McGivern | 2016-08-12 | 2 | -11/+8 |
| | | |||||
| * | Fix merge conflict reading for new diffs | Sean McGivern | 2016-08-12 | 1 | -1/+1 |
| | | |||||
| * | Allow resolving conflicts in MR controller | Sean McGivern | 2016-08-12 | 2 | -1/+63 |
| | | |||||
| * | Handle multiple merge conflict files in collection | Sean McGivern | 2016-08-12 | 3 | -14/+71 |
| | | |||||
| * | Add backend for merge conflicts reading | Sean McGivern | 2016-08-12 | 2 | -0/+150 |
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |