Ahmad Sherif
|
b4b267b739
|
Migrate Repository#can_be_merged? to Gitaly
|
2018-01-11 16:40:13 +01:00 |
|
Jacob Vosmaer
|
ce09dc3182
|
Fix method lookup
|
2018-01-03 12:45:53 +01:00 |
|
Alejandro Rodríguez
|
65e3a1e9e9
|
Simplify conflict resolution interface and code
- Add a Gitlab::Git::Conflict::Resolution class to encapsulate
resolution data
- Simplify conflict file collection assembly
|
2018-01-02 16:22:02 -03:00 |
|
Alejandro Rodríguez
|
0aa87bbe13
|
Incorporate ConflictsService.ResolveConflicts Gitaly RPC
|
2017-12-27 15:14:25 -03:00 |
|
Alejandro Rodríguez
|
351f205c05
|
Incorporate ConflictsService.ListConflictFiles Gitaly RPC
|
2017-12-27 15:12:30 -03:00 |
|