gitaly 13.11.0.pre.rc1 → 13.12.0.pre.rc1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 855bb9a5ebd1a91af21db1996570acb71b9b47e6b1706543b151188dff6a8f91
4
- data.tar.gz: 4769196b75566f077d6348eefef39be4724fe133e109ea9dc893136c3afdd915
3
+ metadata.gz: 7bd362a663fa9e3e8a83544299553504432e9d860127b9f97069c2ad25b8e88a
4
+ data.tar.gz: 4b9683113361ebb2d63bd2857f1c583b1befa1c6091ac86d4e708bffdf330665
5
5
  SHA512:
6
- metadata.gz: f32a656a534d76b041d362a8ca3f5785e2eb31d081c36e4416d029bd1561aa691d716fbef1c30c859cb0f5ecd54cbe5b870f3f2a4070b31331d4a1b8abcbe203
7
- data.tar.gz: b800e1735d25fecb6df67553468ebc821cc1f1d6a45d5e451dc4a4af14c761f7aed677ad8dd19b0aebea445d617818fcd60edf144acd4c6bad6f09a00a910142
6
+ metadata.gz: fef2f798af5c0d6817987389d2da01a072efaa80dbff427dc3f859f15483a3d0b6561cba5b0e2e544ca74a65d309b3f7ef149f48edd799dc12369654e203c68a
7
+ data.tar.gz: da178514af69b348df508a986ee7e39d115dbe7f1132d7169a4b23a6323cbd9c82221f6e052f2b940f53ea58fee655909f4589bc936eb00ec182170bcd06d190
@@ -49,6 +49,7 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
49
49
  optional :repository, :message, 1, "gitaly.Repository"
50
50
  optional :from, :bytes, 2
51
51
  optional :to, :bytes, 3
52
+ optional :pagination_params, :message, 4, "gitaly.PaginationParameter"
52
53
  end
53
54
  add_message "gitaly.CommitsBetweenResponse" do
54
55
  repeated :commits, :message, 1, "gitaly.GitCommit"
@@ -15,6 +15,9 @@ module Gitaly
15
15
  self.service_name = 'gitaly.ConflictsService'
16
16
 
17
17
  rpc :ListConflictFiles, Gitaly::ListConflictFilesRequest, stream(Gitaly::ListConflictFilesResponse)
18
+ # ResolveConflicts tries to resolve a conflicting merge with a set of
19
+ # user-provided merge resolutions. If resolving the conflict succeeds, the
20
+ # result will be a new merge commit.
18
21
  rpc :ResolveConflicts, stream(Gitaly::ResolveConflictsRequest), Gitaly::ResolveConflictsResponse
19
22
  end
20
23
 
@@ -50,6 +50,8 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
50
50
  add_message "gitaly.FindRemoteRootRefRequest" do
51
51
  optional :repository, :message, 1, "gitaly.Repository"
52
52
  optional :remote, :string, 2
53
+ optional :remote_url, :string, 3
54
+ optional :http_authorization_header, :string, 4
53
55
  end
54
56
  add_message "gitaly.FindRemoteRootRefResponse" do
55
57
  optional :ref, :string, 1
@@ -24,6 +24,11 @@ module Gitaly
24
24
  # the patterns specified in the requests.
25
25
  rpc :UpdateRemoteMirror, stream(Gitaly::UpdateRemoteMirrorRequest), Gitaly::UpdateRemoteMirrorResponse
26
26
  rpc :FindRemoteRepository, Gitaly::FindRemoteRepositoryRequest, Gitaly::FindRemoteRepositoryResponse
27
+ # FindRemoteRootRef tries to find the root reference of a remote
28
+ # repository. The root reference is the default branch as pointed to by
29
+ # the remotes HEAD reference. Returns an InvalidArgument error if the
30
+ # specified remote does not exist and a NotFound error in case no HEAD
31
+ # branch was found.
27
32
  rpc :FindRemoteRootRef, Gitaly::FindRemoteRootRefRequest, Gitaly::FindRemoteRootRefResponse
28
33
  end
29
34
 
@@ -2,5 +2,5 @@
2
2
  # (https://gitlab.com/gitlab-org/release-tools/), and should not be
3
3
  # modified.
4
4
  module Gitaly
5
- VERSION = '13.11.0-rc1'
5
+ VERSION = '13.12.0-rc1'
6
6
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: gitaly
3
3
  version: !ruby/object:Gem::Version
4
- version: 13.11.0.pre.rc1
4
+ version: 13.12.0.pre.rc1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Jacob Vosmaer
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2021-04-06 00:00:00.000000000 Z
11
+ date: 2021-04-29 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: grpc