Merge branch 'feature/git-v2-flag' into 'master'

Add git_v2 flag to GitalyClient See merge request gitlab-org/gitlab-ce!21520

Merge branch 'feature/git-v2-flag' into 'master'
Add git_v2 flag to GitalyClient See merge request gitlab-org/gitlab-ce!21520
2f0a0761 · Nick Thomas · abc2caaa · c6c6de8a · 2f0a0761 · 2f0a0761
Commit 2f0a0761 authored Sep 06, 2018 by Nick Thomas
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

changelogs/unreleased/feature-git-v2-flag.yml changelogs/unreleased/feature-git-v2-flag.yml +5 -0

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

No files found.
--- a/changelogs/unreleased/feature-git-v2-flag.yml
+++ b/changelogs/unreleased/feature-git-v2-flag.yml
+---
+title: Add git_v2 feature flag
+merge_request: 21520
+author:
+type: added
--- a/lib/gitlab/gitaly_client.rb
+++ b/lib/gitlab/gitaly_client.rb
@@ -206,7 +206,7 @@ module Gitlab
      result
    end

-    SERVER_FEATURE_FLAGS = %w[gogit_findcommit].freeze
+    SERVER_FEATURE_FLAGS = %w[gogit_findcommit git_v2].freeze

    def self.server_feature_flags
      SERVER_FEATURE_FLAGS.map do |f|