GitLab Bot
|
d41c040fa2
|
Add latest changes from gitlab-org/gitlab@master
|
2019-11-13 03:06:31 +00:00 |
|
Stan Hu
|
df650eaae5
|
Force source and target branch to binary mode
|
2019-06-10 20:50:00 -07:00 |
|
Stan Hu
|
1edf1807c5
|
Fix UTF-8 conversion issues when resolving conflicts
Similar to https://gitlab.com/gitlab-org/gitlab-ce/issues/63030,
when the commit message in the /resolve_conflicts endpoint contains a
UTF-8 character, the conversion to the Gitaly ASCII-8BIT value may flag
an error. To fix this, we run `force_encoding` on the commit message.
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/63062
|
2019-06-10 15:54:14 -07:00 |
|
Ahmad Sherif
|
b4b267b739
|
Migrate Repository#can_be_merged? to Gitaly
|
2018-01-11 16:40:13 +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 |