| Age | Commit message (Expand) | Author |
|---|---|---|
| 2016-08-25 | Handle non-UTF-8 conflicts gracefully | Sean McGivern |
| 2016-08-12 | Find match line headers by backtracking | Sean McGivern |
| 2016-08-12 | Add more tests for conflicts | Sean McGivern |
| 2016-08-12 | Clarify Conflict::File#sections method | Sean McGivern |
| 2016-08-12 | Add blob_icon to conflict file JSON | Sean McGivern |
| 2016-08-12 | Add blob_path to conflict file JSON | Sean McGivern |
| 2016-08-12 | Use same resolution format on FE and BE | Sean McGivern |
| 2016-08-12 | Fix specs | Sean McGivern |
| 2016-08-12 | Raise errors for large and binary files | Sean McGivern |
| 2016-08-12 | Auto-highlight conflict when rich_text is called | Sean McGivern |
| 2016-08-12 | Allow resolving conflicts in MR controller | Sean McGivern |
| 2016-08-12 | Handle multiple merge conflict files in collection | Sean McGivern |
| 2016-08-12 | Add backend for merge conflicts reading | Sean McGivern |
Welcome to mirror list, hosted at ThFree Co, Russian Federation.
 |
index : gitlab.com/gitlab-org/gitlab-foss.git | |
| Unnamed repository; edit this file 'description' to name the repository. | root |
| summaryrefslogtreecommitdiff |