| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Cache `#can_be_resolved_in_ui?` git operationscache-refactor | Alejandro Rodríguez | 2018-03-08 | 1 | -0/+32 |
| * | Refactor conflict resolution to contain git ops within Gitlab::Git | Alejandro Rodríguez | 2017-10-12 | 1 | -1/+1 |
| * | Remove superfluous lib: true, type: redis, service: true, models: true, servi... | Rémy Coutable | 2017-07-27 | 1 | -1/+1 |
| * | Fix conflict resolution from corrupted upstreamfix-conflict-resolution-with-corrupt-repos | Sean McGivern | 2017-05-12 | 1 | -1/+1 |
| * | Add more tests for conflicts | Sean McGivern | 2016-08-12 | 1 | -2/+2 |
| * | Handle multiple merge conflict files in collection | Sean McGivern | 2016-08-12 | 1 | -0/+24 |
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |