summaryrefslogtreecommitdiff
path: root/lib/gitlab/gitaly_client/repository_service.rb
diff options
context:
space:
mode:
authorAlejandro Rodríguez <alejorro70@gmail.com>2018-02-07 18:26:35 -0300
committerAlejandro Rodríguez <alejorro70@gmail.com>2018-02-21 17:35:31 -0300
commitacc0e25de739aa515dbf8ef151921f366fe322b1 (patch)
tree98b2c8f79c0864f2d9f266556929a02b9a5eda9f /lib/gitlab/gitaly_client/repository_service.rb
parentb2761d17716878e104b596161370780f9c035c25 (diff)
downloadgitlab-ce-acc0e25de739aa515dbf8ef151921f366fe322b1.tar.gz
Incorporate Gitaly's RepositoryService.IsSquashInProgress RPCce-gitaly-squash-in-progress
Diffstat (limited to 'lib/gitlab/gitaly_client/repository_service.rb')
-rw-r--r--lib/gitlab/gitaly_client/repository_service.rb17
1 files changed, 17 insertions, 0 deletions
diff --git a/lib/gitlab/gitaly_client/repository_service.rb b/lib/gitlab/gitaly_client/repository_service.rb
index 60706b4f0d8..603457d0664 100644
--- a/lib/gitlab/gitaly_client/repository_service.rb
+++ b/lib/gitlab/gitaly_client/repository_service.rb
@@ -134,6 +134,23 @@ module Gitlab
response.in_progress
end
+ def squash_in_progress?(squash_id)
+ request = Gitaly::IsSquashInProgressRequest.new(
+ repository: @gitaly_repo,
+ squash_id: squash_id.to_s
+ )
+
+ response = GitalyClient.call(
+ @storage,
+ :repository_service,
+ :is_squash_in_progress,
+ request,
+ timeout: GitalyClient.default_timeout
+ )
+
+ response.in_progress
+ end
+
def fetch_source_branch(source_repository, source_branch, local_ref)
request = Gitaly::FetchSourceBranchRequest.new(
repository: @gitaly_repo,