Automatic merge of gitlab-org/gitlab-ce master

2369e488 · GitLab Bot · 1e56cd0c · 5251dec5 · 2369e488
Commit 2369e488 authored Aug 22, 2019 by GitLab Bot
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

lib/feature/gitaly.rb lib/feature/gitaly.rb +4 -2

No files found.
--- a/lib/feature/gitaly.rb
+++ b/lib/feature/gitaly.rb
@@ -6,8 +6,10 @@ class Feature
  class Gitaly
    # Server feature flags should use '_' to separate words.
    SERVER_FEATURE_FLAGS =
-      [
-        'get_commit_signatures'.freeze
+      %w[
+        get_commit_signatures
+        cache_invalidator
+        inforef_uploadpack_cache
      ].freeze

    DEFAULT_ON_FLAGS = Set.new([]).freeze