summaryrefslogtreecommitdiff
path: root/lib/gitlab/gitaly_client.rb
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2019-03-27 18:15:26 -0500
committerStan Hu <stanhu@gmail.com>2019-03-27 18:17:25 -0500
commit7a2325e43c1fe726b4affc544449a763fb52b9e7 (patch)
treec04c49e55a30e10dc0030a0527cad8ae64570204 /lib/gitlab/gitaly_client.rb
parentdb759c5d9ca3ba9c1610b05d6725c1427d653bef (diff)
downloadgitlab-ce-7a2325e43c1fe726b4affc544449a763fb52b9e7.tar.gz
Guard against nested allows with ref name cachingsh-fix-gitaly-find-commit-caching
This avoids the case: ``` allow_ref_name_caching do allow_ref_name_caching do # using-feature end end ```
Diffstat (limited to 'lib/gitlab/gitaly_client.rb')
-rw-r--r--lib/gitlab/gitaly_client.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/gitlab/gitaly_client.rb b/lib/gitlab/gitaly_client.rb
index bc2f7693fdc..42195f566eb 100644
--- a/lib/gitlab/gitaly_client.rb
+++ b/lib/gitlab/gitaly_client.rb
@@ -302,6 +302,7 @@ module Gitlab
# branch, this method allows caching of the ref name directly.
def self.allow_ref_name_caching
return yield unless Gitlab::SafeRequestStore.active?
+ return yield if ref_name_caching_allowed?
begin
Gitlab::SafeRequestStore[:allow_ref_name_caching] = true