diff options
| author | Sean McGivern <sean@gitlab.com> | 2019-05-07 15:18:08 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2019-05-07 15:18:08 +0000 |
| commit | 3e6e02a1d771d25d90da187ba414a434807a5b51 (patch) | |
| tree | 43f7e404da4fa871fa20e7ec5b3fe68189a6967c | |
| parent | ed823c356f3875bf499b12aef29d3fe061b5a666 (diff) | |
| parent | 5dc68854f85baa56f82d8c9aeafc9bcad84050c1 (diff) | |
| download | gitlab-ce-3e6e02a1d771d25d90da187ba414a434807a5b51.tar.gz | |
Merge branch 'register-gitaly-flags' into 'master'
Register "gitaly_delta_islands" feature flag
See merge request gitlab-org/gitlab-ce!28181
| -rw-r--r-- | lib/gitlab/gitaly_client.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/gitlab/gitaly_client.rb b/lib/gitlab/gitaly_client.rb index 4908f236cd1..05e06eec012 100644 --- a/lib/gitlab/gitaly_client.rb +++ b/lib/gitlab/gitaly_client.rb @@ -32,7 +32,8 @@ module Gitlab CLIENT_NAME = (Sidekiq.server? ? 'gitlab-sidekiq' : 'gitlab-web').freeze SERVER_FEATURE_CATFILE_CACHE = 'catfile-cache'.freeze - SERVER_FEATURE_FLAGS = [SERVER_FEATURE_CATFILE_CACHE].freeze + # Server feature flags should use '_' to separate words. + SERVER_FEATURE_FLAGS = [SERVER_FEATURE_CATFILE_CACHE, 'delta_islands'].freeze MUTEX = Mutex.new |