diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-31 00:08:01 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-31 00:08:01 +0300 |
commit | 95ad46159e4cd93f2b31838199180d824e041994 (patch) | |
tree | d41880d3b6a0093463694978590e590efb08caef /lib/gitlab/git | |
parent | 2c72daf2f1744f2b8c8c6674c266907e9ef55558 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/git')
-rw-r--r-- | lib/gitlab/git/repository.rb | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/lib/gitlab/git/repository.rb b/lib/gitlab/git/repository.rb index 9adabd4e8fe..ed746163748 100644 --- a/lib/gitlab/git/repository.rb +++ b/lib/gitlab/git/repository.rb @@ -944,6 +944,10 @@ module Gitlab Gitlab::GitalyClient::ConflictsService.new(self, our_commit_oid, their_commit_oid) end + def praefect_info_client + @praefect_info_client ||= Gitlab::GitalyClient::PraefectInfoService.new(self) + end + def clean_stale_repository_files wrapped_gitaly_errors do gitaly_repository_client.cleanup if exists? @@ -1019,6 +1023,12 @@ module Gitlab raise NoRepository # Guard against data races. end + def replicas + wrapped_gitaly_errors do + praefect_info_client.replicas + end + end + private def empty_diff_stats |