| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Allow resolving conflicts with non-ASCII charsallow-resolving-conflicts-in-utf-8 | Sean McGivern | 2017-03-15 | 1 | -5/+3 |
| * | Enable and autocorrect the CustomErrorClass cop | Sean McGivern | 2017-03-01 | 1 | -16/+6 |
| * | Allow setting content for resolutions | Sean McGivern | 2016-10-13 | 1 | -5/+10 |
| * | Fix merge conflict size limitfix-allowed-conflict-size | Sean McGivern | 2016-09-07 | 1 | -1/+1 |
| * | Handle non-UTF-8 conflicts gracefully21247-mergerequestscontroller-conflicts-may-fail-with-iso-8859-data | Sean McGivern | 2016-08-25 | 1 | -0/+9 |
| * | Fix specs | Sean McGivern | 2016-08-12 | 1 | -3/+3 |
| * | 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 | 1 | -2/+5 |
| * | Auto-highlight conflict when rich_text is called | Sean McGivern | 2016-08-12 | 1 | -3/+3 |
| * | Handle multiple merge conflict files in collection | Sean McGivern | 2016-08-12 | 1 | -6/+2 |
| * | Add backend for merge conflicts reading | Sean McGivern | 2016-08-12 | 1 | -0/+59 |
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |