Age | Commit message (Expand) | Author |
---|---|---|
2018-04-06 | Fix 500 error when MR from fork has conflicts but worker has not run | Sean McGivern |
2018-01-11 | Migrate Repository#can_be_merged? to Gitaly | Ahmad Sherif |
2018-01-02 | Simplify conflict resolution interface and code | Alejandro Rodríguez |
2017-12-27 | Incorporate ConflictsService.ResolveConflicts Gitaly RPC | Alejandro Rodríguez |
2017-12-27 | Incorporate ConflictsService.ListConflictFiles Gitaly RPC | Alejandro Rodríguez |
2017-12-14 | Simplify conflict resolver interface | Alejandro Rodríguez |
2017-12-04 | Use `String#end_with?` instead of `String#ends_with?` | Alejandro Rodríguez |
2017-10-13 | Create a Gitlab::Git submodule for conlict-related files | Alejandro Rodríguez |