diff options
| author | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2014-11-20 11:06:27 +0100 |
|---|---|---|
| committer | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2014-11-20 11:06:27 +0100 |
| commit | f8453da5868dd7a23d0f2f3da7a45e33c441d1db (patch) | |
| tree | 4287dcaab5a9b0e8be14e82104a109ca9349b81a /lib/gitlab_net.rb | |
| parent | 11311a95545f967a5736cd16ab5fc37f7e658519 (diff) | |
| download | gitlab-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_net.rb')
| -rw-r--r-- | lib/gitlab_net.rb | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/lib/gitlab_net.rb b/lib/gitlab_net.rb index 1f27398..e6478ef 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 check_access(cmd, repo, actor, changes) + def allowed?(cmd, repo, actor, changes) project_name = repo.gsub("'", "") project_name = project_name.gsub(/\.git\Z/, "") project_name = project_name.gsub(/\A\//, "") @@ -26,11 +26,7 @@ class GitlabNet url = "#{host}/allowed" resp = post(url, params) - if resp.code == '200' - GitAccessStatus.create_from_json(resp.body) - else - GitAccessStatus.new(false, "API is not accesible") - end + !!(resp.code == '200' && resp.body == 'true') end def discover(key) |