diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-10-11 12:09:08 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-10-11 12:09:08 +0300 |
commit | 31a9181ed65e80ceac2cbd6e2dba9af40e7b0d0b (patch) | |
tree | 29d9b11c777d092c0b3e453cc0f44a0a52ecb000 /lib/gitlab/workhorse.rb | |
parent | be7d70b884e6fa66c52862f38bf0f39b0631868b (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, 2 insertions, 1 deletions
diff --git a/lib/gitlab/workhorse.rb b/lib/gitlab/workhorse.rb index 0f33c3aa68e..5780e4d6da8 100644 --- a/lib/gitlab/workhorse.rb +++ b/lib/gitlab/workhorse.rb @@ -32,7 +32,8 @@ module Gitlab GitalyServer: { address: Gitlab::GitalyClient.address(repository.storage), token: Gitlab::GitalyClient.token(repository.storage), - features: Feature::Gitaly.server_feature_flags(repository.project) + features: Feature::Gitaly.server_feature_flags(repository.project), + sidechannel: Feature.enabled?(:workhorse_use_sidechannel, repository.project, default_enabled: :yaml) } } |