| Age | Commit message (Expand) | Author |
|---|---|---|
| 2017-03-15 | Allow resolving conflicts with non-ASCII chars | Sean McGivern |
| 2017-03-01 | Enable and autocorrect the CustomErrorClass cop | Sean McGivern |
| 2016-10-13 | Allow setting content for resolutions | Sean McGivern |
| 2016-09-07 | Fix merge conflict size limit | Sean McGivern |
| 2016-08-25 | Handle non-UTF-8 conflicts gracefully | Sean McGivern |
| 2016-08-12 | Fix specs | Sean McGivern |
| 2016-08-12 | Raise errors for large and binary files | Sean McGivern |
| 2016-08-12 | Handle conflict resolution errors in controller | Sean McGivern |
| 2016-08-12 | Auto-highlight conflict when rich_text is called | 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 |