diff options
| author | Patrick Steinhardt <psteinhardt@gitlab.com> | 2021-09-21 12:32:37 +0300 |
|---|---|---|
| committer | Patrick Steinhardt <psteinhardt@gitlab.com> | 2021-09-21 12:32:37 +0300 |
| commit | 11ba3e1c8f6d1ce04bd5daeca96dea674c0b54ff (patch) | |
| tree | 2390a672d535ec996883109ec6933421b4799c26 /ruby | |
| parent | 08462660739d1dec9365fe6c25efaace6c1485d3 (diff) | |
repository: Remove `IsSquashInProgress()` RPC
In release 14.2, we have converted `UserSquash()` to never use worktrees
anymore. As a result, the old `IsSquashInProgress()` RPC doesn't really
do anything anymore and always returns the equivalent of `false`.
Upstream has thus been converted in b5b78c33c9f (merge_request: Drop
checks whether a squash is in progress, 2021-08-20) to not use the RPC
anymore, leaving it without callers.
Remove `IsSquashInProgress()`.
Changelog: removed
Diffstat (limited to 'ruby')
| -rw-r--r-- | ruby/proto/gitaly/repository-service_pb.rb | 9 | ||||
| -rw-r--r-- | ruby/proto/gitaly/repository-service_services_pb.rb | 2 |
2 files changed, 0 insertions, 11 deletions
diff --git a/ruby/proto/gitaly/repository-service_pb.rb b/ruby/proto/gitaly/repository-service_pb.rb index 4db2937f4..b5fc2aeb8 100644 --- a/ruby/proto/gitaly/repository-service_pb.rb +++ b/ruby/proto/gitaly/repository-service_pb.rb @@ -143,13 +143,6 @@ Google::Protobuf::DescriptorPool.generated_pool.build do end add_message "gitaly.CreateForkResponse" do end - add_message "gitaly.IsSquashInProgressRequest" do - optional :repository, :message, 1, "gitaly.Repository" - optional :squash_id, :string, 2 - end - add_message "gitaly.IsSquashInProgressResponse" do - optional :in_progress, :bool, 1 - end add_message "gitaly.CreateRepositoryFromURLRequest" do optional :repository, :message, 1, "gitaly.Repository" optional :url, :string, 2 @@ -368,8 +361,6 @@ module Gitaly FindMergeBaseResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.FindMergeBaseResponse").msgclass CreateForkRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.CreateForkRequest").msgclass CreateForkResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.CreateForkResponse").msgclass - IsSquashInProgressRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.IsSquashInProgressRequest").msgclass - IsSquashInProgressResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.IsSquashInProgressResponse").msgclass CreateRepositoryFromURLRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.CreateRepositoryFromURLRequest").msgclass CreateRepositoryFromURLResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.CreateRepositoryFromURLResponse").msgclass CreateBundleRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.CreateBundleRequest").msgclass diff --git a/ruby/proto/gitaly/repository-service_services_pb.rb b/ruby/proto/gitaly/repository-service_services_pb.rb index 37c2187f4..c6d740bb2 100644 --- a/ruby/proto/gitaly/repository-service_services_pb.rb +++ b/ruby/proto/gitaly/repository-service_services_pb.rb @@ -35,8 +35,6 @@ module Gitaly rpc :WriteRef, Gitaly::WriteRefRequest, Gitaly::WriteRefResponse rpc :FindMergeBase, Gitaly::FindMergeBaseRequest, Gitaly::FindMergeBaseResponse rpc :CreateFork, Gitaly::CreateForkRequest, Gitaly::CreateForkResponse - # IsSquashInProgress is deprecated and will always return false. - rpc :IsSquashInProgress, Gitaly::IsSquashInProgressRequest, Gitaly::IsSquashInProgressResponse rpc :CreateRepositoryFromURL, Gitaly::CreateRepositoryFromURLRequest, Gitaly::CreateRepositoryFromURLResponse # CreateBundle creates a bundle from all refs rpc :CreateBundle, Gitaly::CreateBundleRequest, stream(Gitaly::CreateBundleResponse) |