3f0e6d9205
More Gitaly cleanup: fetch_ref, allow disk access blocks
2018-07-27 08:43:19 +00:00
9f8326995c
Partially rever "Revert "Merge branch 'gitaly-mandatory-20180703-jv' into 'master'""
...
This partially reverts commit 64dfe2cba1
2018-07-06 11:43:01 +02:00
64dfe2cba1
Revert "Merge branch 'gitaly-mandatory-20180703-jv' into 'master'"
...
This reverts merge request !20339
2018-07-05 10:22:04 +00:00
78708b1932
Make more Gitaly features mandatory
2018-07-04 07:39:59 +00:00
30bca22d08
Fix 500 error when MR from fork has conflicts but worker has not run
...
If the ref hasn't been fetched into the target repository yet, this will fail
with a Rugged::ReferencError (assuming we're not using Gitaly). We should handle
this in the same way as a missing ref.
2018-04-06 12:16:51 +01:00
b4b267b739
Migrate Repository#can_be_merged? to Gitaly
2018-01-11 16:40:13 +01:00
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
0aa87bbe13
Incorporate ConflictsService.ResolveConflicts Gitaly RPC
2017-12-27 15:14:25 -03:00
351f205c05
Incorporate ConflictsService.ListConflictFiles Gitaly RPC
2017-12-27 15:12:30 -03:00
240945f87e
Simplify conflict resolver interface
...
This does two things:
- Pass commit oids instead of `Gitlab::Git::Commit`s. We only need the
former.
- Depend on only the target repository for conflict listing. For
conflict resolution, treat one repository as a remote one so that we can
implement it as such in Gitaly.
2017-12-14 16:02:50 -03:00
359b65beac
Use `String#end_with?` instead of `String#ends_with?`
...
The former is in Ruby's core lib, so is more flexible.
2017-12-04 16:11:54 -03:00
faa9bd402d
Create a Gitlab::Git submodule for conlict-related files
...
Rename classes to (hopefully) clearer names while we're doing that.
2017-10-12 22:03:15 -03:00
Jacob Vosmaer (GitLab)
Sean McGivern
Ahmad Sherif
Alejandro Rodríguez