summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2018-08-08 21:54:58 +0000
committerJulius Kvedaras <juliuskvedaras@yahoo.ie>2018-08-09 13:14:32 +0100
commit5f79aeec38c157816f6a56aab0bd40c56338c52d (patch)
tree1d5167ca305a200f1fd88ddadb3502e0f2e95f40
parent65d0a4265afa8f4f984147dfe9fb8eda2936e37b (diff)
downloadgitlab-ce-5f79aeec38c157816f6a56aab0bd40c56338c52d.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