From e72e2f9ba0a160960f68035fbbdbe3f0f86b0dba Mon Sep 17 00:00:00 2001
From: Lin Jen-Shin <godfat@godfat.org>
Date: Fri, 18 Nov 2016 04:11:04 +0800
Subject: Still grant :download_code if guest could do that

Feedback:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7383#note_18518792
---
 lib/gitlab/git_access.rb | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'lib')

diff --git a/lib/gitlab/git_access.rb b/lib/gitlab/git_access.rb
index d5690f870e9..3f674532488 100644
--- a/lib/gitlab/git_access.rb
+++ b/lib/gitlab/git_access.rb
@@ -48,11 +48,9 @@ module Gitlab
         deploy_key.has_access_to?(project)
       elsif user
         user_download_access_check
-      elsif Guest.can?(:download_code, project)
-        true
-      else
-        raise UnauthorizedError, ERROR_MESSAGES[:download]
-      end
+      end ||
+        Guest.can?(:download_code, project) ||
+        raise(UnauthorizedError, ERROR_MESSAGES[:download])
     end
 
     def push_access_check(changes)
-- 
cgit v1.2.1