| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Fix conflict resolution from corrupted upstreamfix-conflict-resolution-with-corrupt-repos | Sean McGivern | 2017-05-12 | 1 | -65/+0 |
| * | Enable and autocorrect the CustomErrorClass cop | Sean McGivern | 2017-03-01 | 1 | -2/+1 |
| * | Allow setting content for resolutions | Sean McGivern | 2016-10-13 | 1 | -4/+20 |
| * | Use Repository#fetch_ref | Sean McGivern | 2016-08-30 | 1 | -2/+7 |
| * | Fix resolving conflicts on forks21459-resolving-merge-conflicts-from-a-forked-repo-through-ui | Sean McGivern | 2016-08-30 | 1 | -1/+15 |
| * | Move resolving code to ResolveService | Sean McGivern | 2016-08-12 | 1 | -0/+31 |
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |