Automatic merge of gitlab-org/gitlab-ce master

7496f788 · GitLab Bot · 63cd4b2f · 3e6e02a1 · 7496f788
Commit 7496f788 authored May 07, 2019 by GitLab Bot
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

lib/gitlab/gitaly_client.rb lib/gitlab/gitaly_client.rb +2 -1

No files found.
--- 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