diff options
| author | Sean McGivern <sean@gitlab.com> | 2018-11-20 13:36:52 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2018-11-20 13:36:52 +0300 |
| commit | 2742b871fe44c649b4b503d10f5875276fb8fd87 (patch) | |
| tree | 4c022342bd0b7f2f9464b2fe6ee5a8d1e8a58a34 /lib/gitlab/git | |
| parent | 799486373e74711db65c2f77d11b1ec77fd7f4d9 (diff) | |
Revert "Merge branch 'zj-improve-gitaly-pb' into 'master'"
This reverts merge request !23140
Diffstat (limited to 'lib/gitlab/git')
| -rw-r--r-- | lib/gitlab/git/blob.rb | 2 | ||||
| -rw-r--r-- | lib/gitlab/git/repository.rb | 6 |
2 files changed, 8 insertions, 0 deletions
diff --git a/lib/gitlab/git/blob.rb b/lib/gitlab/git/blob.rb index 2d25389594e..9dd1c484d59 100644 --- a/lib/gitlab/git/blob.rb +++ b/lib/gitlab/git/blob.rb @@ -1,5 +1,7 @@ # frozen_string_literal: true +# Gitaly note: JV: seems to be completely migrated (behind feature flags). + module Gitlab module Git class Blob diff --git a/lib/gitlab/git/repository.rb b/lib/gitlab/git/repository.rb index 289796ae93b..993955d1a6b 100644 --- a/lib/gitlab/git/repository.rb +++ b/lib/gitlab/git/repository.rb @@ -885,6 +885,12 @@ module Gitlab Gitlab::GitalyClient::ConflictsService.new(self, our_commit_oid, their_commit_oid) end + def gitaly_migrate(method, status: Gitlab::GitalyClient::MigrationStatus::OPT_IN, &block) + wrapped_gitaly_errors do + Gitlab::GitalyClient.migrate(method, status: status, &block) + end + end + def clean_stale_repository_files wrapped_gitaly_errors do gitaly_repository_client.cleanup if exists? |