summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2018-08-08 21:54:58 +0000
committerStan Hu <stanhu@gmail.com>2018-08-08 21:54:58 +0000
commit68082d352516b5367fce76453b8992f4e44d127e (patch)
treea07645b27d61188c88b7c6cbed28c6105869c6f3
parentbe1ef711edb13114cf6478821293bb2f0821e75c (diff)
parent6688a719c44ab826bee1ca47b301812bd02cb1a6 (diff)
downloadgitlab-ce-68082d352516b5367fce76453b8992f4e44d127e.tar.gz
Merge branch 'rd-fix-bug-when-authenticating-user-for-repo-with-size-check-enabled-ce' into 'master'
Backport of gitlab-org/gitlab-ee!6848 See merge request gitlab-org/gitlab-ce!21096
-rw-r--r--lib/gitlab/git/repository.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/git/repository.rb b/lib/gitlab/git/repository.rb
index de189ac6dfc..3e11355435b 100644
--- a/lib/gitlab/git/repository.rb
+++ b/lib/gitlab/git/repository.rb
@@ -382,7 +382,7 @@ module Gitlab
end
def new_blobs(newrev)
- return [] if newrev == ::Gitlab::Git::BLANK_SHA
+ return [] if newrev.blank? || newrev == ::Gitlab::Git::BLANK_SHA
strong_memoize("new_blobs_#{newrev}") do
wrapped_gitaly_errors do