diff options
| author | Patrick Steinhardt <psteinhardt@gitlab.com> | 2022-05-02 12:42:47 +0300 |
|---|---|---|
| committer | Patrick Steinhardt <psteinhardt@gitlab.com> | 2022-05-09 13:10:27 +0300 |
| commit | 4c7a9be67a16746bf6f44a68caf75a7cffd5e969 (patch) | |
| tree | 9c091fa5d827808b66c0a1053e7cff3d15e23482 /proto/conflicts.proto | |
| parent | 95c3d0fc69bf4ed0f850e123eb03b909c8547199 (diff) | |
proto: Enforce comment-linting for RPC definitions
Enforce that RPC definitions must have a comment and add a placeholder
for all instances where such a comment is missing.
Diffstat (limited to 'proto/conflicts.proto')
| -rw-r--r-- | proto/conflicts.proto | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/proto/conflicts.proto b/proto/conflicts.proto index 25eb0965e..14c8f3c76 100644 --- a/proto/conflicts.proto +++ b/proto/conflicts.proto @@ -11,6 +11,9 @@ option go_package = "gitlab.com/gitlab-org/gitaly/v14/proto/go/gitalypb"; // ConflictsService is a service which provides RPCs to interact with conflicts // resulting from a merge. service ConflictsService { + + // ListConflictFiles returns all conflicting files which result from a merge + // of two specified commit objects. rpc ListConflictFiles(ListConflictFilesRequest) returns (stream ListConflictFilesResponse) { option (op_type) = { op: ACCESSOR @@ -25,6 +28,7 @@ service ConflictsService { op: MUTATOR }; } + } message ListConflictFilesRequest { |