diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-03-28 09:53:42 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-03-28 09:53:42 +0000 |
| commit | 06afa5a3ff82e2d6edbcf668cc870e625784c09c (patch) | |
| tree | 3da93dcc36fc4f481ee1445bf515db53faa3754c /lib | |
| parent | ef92eb6b3301a345532ac81552fd5efde3c965da (diff) | |
| download | gitlab-ce-06afa5a3ff82e2d6edbcf668cc870e625784c09c.tar.gz | |
Revert "Merge branch 'workhorse-gitaly-mandatory' into 'master'"
This reverts merge request !18002
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/workhorse.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/gitlab/workhorse.rb b/lib/gitlab/workhorse.rb index 14f58087780..5619130c263 100644 --- a/lib/gitlab/workhorse.rb +++ b/lib/gitlab/workhorse.rb @@ -42,7 +42,7 @@ module Gitlab end def send_git_blob(repository, blob) - params = if Gitlab::GitalyClient.feature_enabled?(:workhorse_raw_show, Gitlab::GitalyClient::MigrationStatus::OPT_OUT) + params = if Gitlab::GitalyClient.feature_enabled?(:workhorse_raw_show) { 'GitalyServer' => gitaly_server_hash(repository), 'GetBlobRequest' => { @@ -70,7 +70,7 @@ module Gitlab params = repository.archive_metadata(ref, Gitlab.config.gitlab.repository_downloads_path, format) raise "Repository or ref not found" if params.empty? - if Gitlab::GitalyClient.feature_enabled?(:workhorse_archive, Gitlab::GitalyClient::MigrationStatus::OPT_OUT) + if Gitlab::GitalyClient.feature_enabled?(:workhorse_archive) params.merge!( 'GitalyServer' => gitaly_server_hash(repository), 'GitalyRepository' => repository.gitaly_repository.to_h @@ -87,7 +87,7 @@ module Gitlab end def send_git_diff(repository, diff_refs) - params = if Gitlab::GitalyClient.feature_enabled?(:workhorse_send_git_diff, Gitlab::GitalyClient::MigrationStatus::OPT_OUT) + params = if Gitlab::GitalyClient.feature_enabled?(:workhorse_send_git_diff) { 'GitalyServer' => gitaly_server_hash(repository), 'RawDiffRequest' => Gitaly::RawDiffRequest.new( @@ -105,7 +105,7 @@ module Gitlab end def send_git_patch(repository, diff_refs) - params = if Gitlab::GitalyClient.feature_enabled?(:workhorse_send_git_patch, Gitlab::GitalyClient::MigrationStatus::OPT_OUT) + params = if Gitlab::GitalyClient.feature_enabled?(:workhorse_send_git_patch) { 'GitalyServer' => gitaly_server_hash(repository), 'RawPatchRequest' => Gitaly::RawPatchRequest.new( |