diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-04 06:08:09 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-04 06:08:09 +0300 |
commit | 89a1014b46ac8c6fa859aa37dbf23358f8d5af01 (patch) | |
tree | c2b93be47ab1a5deed442bad9a53eb562b9ceaac /lib/gitlab/workhorse.rb | |
parent | 09409d9dfb406911f45c867e2364e63a2620e966 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/workhorse.rb')
-rw-r--r-- | lib/gitlab/workhorse.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/gitlab/workhorse.rb b/lib/gitlab/workhorse.rb index d74efd458f6..e81670ce89a 100644 --- a/lib/gitlab/workhorse.rb +++ b/lib/gitlab/workhorse.rb @@ -33,8 +33,7 @@ module Gitlab GitalyServer: { address: Gitlab::GitalyClient.address(repository.storage), token: Gitlab::GitalyClient.token(repository.storage), - features: Feature::Gitaly.server_feature_flags(repository.project), - sidechannel: Feature.enabled?(:workhorse_use_sidechannel, repository.project, default_enabled: :yaml) + features: Feature::Gitaly.server_feature_flags(repository.project) } } |