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_shell.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_shell.rb')
| -rw-r--r-- | lib/gitlab_shell.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab_shell.rb b/lib/gitlab_shell.rb index 95fad9e..e2cb2cc 100644 --- a/lib/gitlab_shell.rb +++ b/lib/gitlab_shell.rb @@ -60,7 +60,7 @@ class GitlabShell end def validate_access - api.check_access(@git_cmd, @repo_name, @key_id, '_any').allowed? + api.allowed?(@git_cmd, @repo_name, @key_id, '_any') end # This method is not covered by Rspec because it ends the current Ruby process. |