kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Refactor _allowed? methods as Rémy asked

Browse source
This commit is contained in:
Jacob Vosmaer 2016-06-03 15:28:35 +02:00
parent 3ffa494ffe
commit 1564074648
1 changed files with 9 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
app/controllers/projects/git_http_controller.rb
View file

@ -128,26 +128,20 @@ class Projects::GitHttpController < Projects::ApplicationController
end end
def upload_pack_allowed? def upload_pack_allowed?
if !Gitlab.config.gitlab_shell.upload_pack return false unless Gitlab.config.gitlab_shell.upload_pack
false
elsif ci? if user
true
elsif user
Gitlab::GitAccess.new(user, project).download_access_check.allowed? Gitlab::GitAccess.new(user, project).download_access_check.allowed?
else else
project.public? ci? || project.public?
end end
end end
def receive_pack_allowed? def receive_pack_allowed?
if !Gitlab.config.gitlab_shell.receive_pack return false unless Gitlab.config.gitlab_shell.receive_pack
false
elsif user # Skip user authorization on upload request.
# Skip user authorization on upload request. # It will be done by the pre-receive hook in the repository.
# It will be done by the pre-receive hook in the repository. user.present?
true
else
false
end
end end
end end