diff options
| author | Sean McGivern <sean@gitlab.com> | 2018-11-22 12:50:34 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2018-11-22 12:50:34 +0300 |
| commit | 2bc4a17decf943123f5adff0ea624eef325d776d (patch) | |
| tree | 2144d1399344696328ba6607803e9745749f8ebb /lib/gitlab/git | |
| parent | f0630090aaea98daef3582bc95efe3a43736a10f (diff) | |
| parent | 5c131dac5e2e7fc85bcbef6c1c8e95912b7759d4 (diff) | |
Merge branch 'revert-fd6e3781' into 'master'
Revert "Merge branch 'revert-e2aa2177' into 'master'"
Closes #54267
See merge request gitlab-org/gitlab-ce!23237
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, 0 insertions, 8 deletions
diff --git a/lib/gitlab/git/blob.rb b/lib/gitlab/git/blob.rb index 9dd1c484d59..2d25389594e 100644 --- a/lib/gitlab/git/blob.rb +++ b/lib/gitlab/git/blob.rb @@ -1,7 +1,5 @@ # 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 e75f4ec1ec5..067f4026f48 100644 --- a/lib/gitlab/git/repository.rb +++ b/lib/gitlab/git/repository.rb @@ -885,12 +885,6 @@ 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? |