diff options
| author | Jacob Vosmaer <jacob@gitlab.com> | 2019-08-28 19:51:17 +0300 |
|---|---|---|
| committer | Michael Kozono <mkozono@gmail.com> | 2019-08-28 19:51:17 +0300 |
| commit | 85d88d67cca58945aa6d4835bf3a518f12019e3a (patch) | |
| tree | 5b97f7dbd8f5295d8bcbfdd83e50783c4a3ad548 /lib | |
| parent | c21c3c6ce894434667cf88bc0d4b17792cb03b0e (diff) | |
Support Gitaly feature flags in workhorse
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/workhorse.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/gitlab/workhorse.rb b/lib/gitlab/workhorse.rb index 3b77fe838ae..29087d26007 100644 --- a/lib/gitlab/workhorse.rb +++ b/lib/gitlab/workhorse.rb @@ -34,7 +34,8 @@ module Gitlab GitConfigOptions: [], GitalyServer: { address: Gitlab::GitalyClient.address(project.repository_storage), - token: Gitlab::GitalyClient.token(project.repository_storage) + token: Gitlab::GitalyClient.token(project.repository_storage), + features: Feature::Gitaly.server_feature_flags } } @@ -250,7 +251,8 @@ module Gitlab def gitaly_server_hash(repository) { address: Gitlab::GitalyClient.address(repository.project.repository_storage), - token: Gitlab::GitalyClient.token(repository.project.repository_storage) + token: Gitlab::GitalyClient.token(repository.project.repository_storage), + features: Feature::Gitaly.server_feature_flags } end |