| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Migrate Repository#can_be_merged? to Gitalyfeature/migrate-can-be-merged-to-gitaly | Ahmad Sherif | 2018-01-11 | 1 | -1/+1 |
| * | Simplify conflict resolution interface and codegitaly-conflict-resolver | Alejandro Rodríguez | 2018-01-02 | 3 | -8/+25 |
| * | Incorporate ConflictsService.ResolveConflicts Gitaly RPC | Alejandro Rodríguez | 2017-12-27 | 1 | -22/+36 |
| * | Incorporate ConflictsService.ListConflictFiles Gitaly RPC | Alejandro Rodríguez | 2017-12-27 | 1 | -5/+19 |
| * | Simplify conflict resolver interfacegitaly-conflicts-prep | Alejandro Rodríguez | 2017-12-14 | 1 | -30/+29 |
| * | Use `String#end_with?` instead of `String#ends_with?`gitaly-conflict-file | Alejandro Rodríguez | 2017-12-04 | 1 | -1/+1 |
| * | Add missing attr_accessor to Gitlab::Git::Conflict::File | Alejandro Rodríguez | 2017-12-04 | 1 | -1/+1 |
| * | Move line code generation into Gitlab::Gitconflict-resolution-refactor | Alejandro Rodríguez | 2017-10-12 | 2 | -14/+3 |
| * | Create a Gitlab::Git submodule for conlict-related files | Alejandro Rodríguez | 2017-10-12 | 4 | -0/+279 |
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |