summaryrefslogtreecommitdiff
path: root/lib/gitlab/git_access.rb
diff options
context:
space:
mode:
authorPatricio Cano <suprnova32@gmail.com>2016-06-27 11:14:44 -0500
committerPatricio Cano <suprnova32@gmail.com>2016-07-05 16:54:22 -0500
commit9397ce9137a8784bff4b63acfce3d4bc1e123cdf (patch)
tree27b7f9be7af134597f54fe70f5d1da52cca0a2f2 /lib/gitlab/git_access.rb
parentda15471bb1c862111300a9202fe06c6a531fb283 (diff)
downloadgitlab-ce-9397ce9137a8784bff4b63acfce3d4bc1e123cdf.tar.gz
Correct access control flow for Git HTTP requests.
Diffstat (limited to 'lib/gitlab/git_access.rb')
-rw-r--r--lib/gitlab/git_access.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/gitlab/git_access.rb b/lib/gitlab/git_access.rb
index beec56fcc62..7dd9594ce68 100644
--- a/lib/gitlab/git_access.rb
+++ b/lib/gitlab/git_access.rb
@@ -169,6 +169,10 @@ module Gitlab
Gitlab::ForcePushCheck.force_push?(project, oldrev, newrev)
end
+ def protocol_allowed?
+ Gitlab::ProtocolAccess.allowed?(protocol)
+ end
+
private
def protected_branch_action(oldrev, newrev, branch_name)
@@ -193,10 +197,6 @@ module Gitlab
Gitlab::UserAccess.allowed?(user)
end
- def protocol_allowed?
- Gitlab::ProtocolAccess.allowed?(protocol)
- end
-
def branch_name(ref)
ref = ref.to_s
if Gitlab::Git.branch_ref?(ref)