summaryrefslogtreecommitdiff
path: root/lib/gitlab_access.rb
diff options
context:
space:
mode:
authorJacob Vosmaer <contact@jacobvosmaer.nl>2014-11-20 11:06:27 +0100
committerJacob Vosmaer <contact@jacobvosmaer.nl>2014-11-20 11:06:27 +0100
commitf8453da5868dd7a23d0f2f3da7a45e33c441d1db (patch)
tree4287dcaab5a9b0e8be14e82104a109ca9349b81a /lib/gitlab_access.rb
parent11311a95545f967a5736cd16ab5fc37f7e658519 (diff)
downloadgitlab-shell-f8453da5868dd7a23d0f2f3da7a45e33c441d1db.tar.gz
Revert "Merge branch 'git_hook_messages'"
At least the following things were broken: - missing require for 'gitlab_access_status' in lib/gitlab_net.rb - gitlabhq master internal API returns 'true' or 'false', gitlab-shell expects JSON This reverts commit 11311a95545f967a5736cd16ab5fc37f7e658519, reversing changes made to 45444597aef3e434571de2491934ae92357ad231.
Diffstat (limited to 'lib/gitlab_access.rb')
-rw-r--r--lib/gitlab_access.rb10
1 files changed, 4 insertions, 6 deletions
diff --git a/lib/gitlab_access.rb b/lib/gitlab_access.rb
index 547b81d..78d353c 100644
--- a/lib/gitlab_access.rb
+++ b/lib/gitlab_access.rb
@@ -1,6 +1,5 @@
require_relative 'gitlab_init'
require_relative 'gitlab_net'
-require_relative 'gitlab_access_status'
require_relative 'names_helper'
require 'json'
@@ -18,14 +17,13 @@ class GitlabAccess
end
def exec
- status = api.check_access('git-receive-pack', @repo_name, @actor, @changes)
- if status.allowed?
- true
+ if api.allowed?('git-receive-pack', @repo_name, @actor, @changes)
+ return true
else
# reset GL_ID env since we stop git push here
ENV['GL_ID'] = nil
- puts "GitLab: #{status.message}"
- false
+ puts "GitLab: You are not allowed to access some of the refs!"
+ return false
end
end