Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Handle non-UTF-8 conflicts gracefully21247-mergerequestscontroller-conflicts-may-fail-with-iso-8859-data | Sean McGivern | 2016-08-25 | 1 | -1/+2 |
* | Add workaround for JS error in spec | Sean McGivern | 2016-08-17 | 1 | -1/+5 |
* | Fix failed test because of a copy change. | Fatih Acet | 2016-08-12 | 1 | -1/+1 |
* | Add more tests for conflicts | Sean McGivern | 2016-08-12 | 1 | -0/+68 |