summaryrefslogtreecommitdiff
path: root/lib/gitlab_net.rb
diff options
context:
space:
mode:
authorValery Sizov <vsv2711@gmail.com>2014-11-24 13:58:07 +0200
committerValery Sizov <vsv2711@gmail.com>2014-11-24 13:58:07 +0200
commit961fe45c4210dcb1a69f167ac468991ad6998793 (patch)
tree484912f3b5b690c67080fd0b2d564c3dfb67924d /lib/gitlab_net.rb
parentf8453da5868dd7a23d0f2f3da7a45e33c441d1db (diff)
downloadgitlab-shell-961fe45c4210dcb1a69f167ac468991ad6998793.tar.gz
Revert "Revert "Merge branch 'git_hook_messages'""
This reverts commit f8453da5868dd7a23d0f2f3da7a45e33c441d1db.
Diffstat (limited to 'lib/gitlab_net.rb')
-rw-r--r--lib/gitlab_net.rb8
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/gitlab_net.rb b/lib/gitlab_net.rb
index e6478ef..1f27398 100644
--- a/lib/gitlab_net.rb
+++ b/lib/gitlab_net.rb
@@ -6,7 +6,7 @@ require_relative 'gitlab_config'
require_relative 'gitlab_logger'
class GitlabNet
- def allowed?(cmd, repo, actor, changes)
+ def check_access(cmd, repo, actor, changes)
project_name = repo.gsub("'", "")
project_name = project_name.gsub(/\.git\Z/, "")
project_name = project_name.gsub(/\A\//, "")
@@ -26,7 +26,11 @@ class GitlabNet
url = "#{host}/allowed"
resp = post(url, params)
- !!(resp.code == '200' && resp.body == 'true')
+ if resp.code == '200'
+ GitAccessStatus.create_from_json(resp.body)
+ else
+ GitAccessStatus.new(false, "API is not accesible")
+ end
end
def discover(key)