summaryrefslogtreecommitdiff
path: root/app/models
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 /app/models
parentdb759c5d9ca3ba9c1610b05d6725c1427d653bef (diff)
downloadgitlab-ce-sh-fix-gitaly-find-commit-caching.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 'app/models')
-rw-r--r--app/models/ci/pipeline.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/ci/pipeline.rb b/app/models/ci/pipeline.rb
index bbde0cdd465..be801f15cc4 100644
--- a/app/models/ci/pipeline.rb
+++ b/app/models/ci/pipeline.rb
@@ -781,7 +781,7 @@ module Ci
end
def git_ref
- strong_memoize(:git_pref) do
+ strong_memoize(:git_ref) do
if merge_request_event?
##
# In the future, we're going to change this ref to