Merge branch 'revert-40e113aa' into 'master'

Revert "Merge branch 'release-tools/update-gitaly' into 'master'" See merge request gitlab-org/gitlab!59246

Merge branch 'revert-40e113aa' into 'master'
Revert "Merge branch 'release-tools/update-gitaly' into 'master'" See merge request gitlab-org/gitlab!59246
e5dfb288 · Heinrich Lee Yu · 8704fc1d · b27b9472 · e5dfb288 · e5dfb288
Commit e5dfb288 authored Apr 13, 2021 by Heinrich Lee Yu
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 3 deletions

GITALY_SERVER_VERSION GITALY_SERVER_VERSION +1 -1

scripts/gitaly_test.rb scripts/gitaly_test.rb +1 -2

No files found.
--- a/GITALY_SERVER_VERSION
+++ b/GITALY_SERVER_VERSION
-996add2f4e011cec8e9317912978cf1fa59e66c1
+4ea88e921af65ba0577c40f8b54830c97adaa56c
--- a/scripts/gitaly_test.rb
+++ b/scripts/gitaly_test.rb
@@ -52,8 +52,7 @@ module GitalyTest
      'RUBYOPT' => nil,

      # Git hooks can't run during tests as the internal API is not running.
-      'GITALY_TESTING_NO_GIT_HOOKS' => "1",
-      'GITALY_TESTING_ENABLE_ALL_FEATURE_FLAGS' => "true"
+      'GITALY_TESTING_NO_GIT_HOOKS' => "1"
    }

    env_hash